r4496 - in glibc-package/branches/eglibc-2.13/debian: . patches/alpha patches/any patches/arm
Author: aurel32
Date: 2011-02-07 09:46:32 +0000 (Mon, 07 Feb 2011)
New Revision: 4496
Removed:
glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-epoll.diff
glibc-package/branches/eglibc-2.13/debian/patches/any/local-csu-init.diff
glibc-package/branches/eglibc-2.13/debian/patches/arm/local-hwcap-updates.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
Log:
Remove a few more removed patches
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-07 09:40:16 UTC (rev 4495)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-07 09:46:32 UTC (rev 4496)
@@ -25,6 +25,7 @@
- Update patches/alpha/submitted-fdatasync.diff.
- Remove patches/alpha/submitted-asm-memchr.diff (merged upstream).
- Remove patches/alpha/submitted-sock_nonblock.diff (merged upstream).
+ - Remove patcheS/alpha/submitted-epoll.diff (merged upstream).
- Remove patches/alpha/cvs-timer_settime.diff (merged upstream).
- Remove patches/alpha/submitted-PTR_MANGLE.diff (obsolete).
- Remove patches/alpha/local-fcntl_h.diff (obsolete).
Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-epoll.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-epoll.diff 2011-02-07 09:40:16 UTC (rev 4495)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-epoll.diff 2011-02-07 09:46:32 UTC (rev 4496)
@@ -1,39 +0,0 @@
-2010-08-31 Mike Frysinger <vapier@gentoo.org>
-
- * sysdeps/unix/sysv/linux/alpha/sys/epoll.h (epoll_create2): Delete.
- (epoll_create1): Add.
----
- sysdeps/unix/sysv/linux/alpha/sys/epoll.h | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h
-index 9f983a5..9177c31 100644
---- a/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2008, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -31,7 +31,7 @@ typedef __sigset_t sigset_t;
- #endif
-
-
--/* Flags to be passed to epoll_create2. */
-+/* Flags to be passed to epoll_create1. */
- enum
- {
- EPOLL_CLOEXEC = 010000000,
-@@ -101,8 +101,9 @@ __BEGIN_DECLS
- returned by epoll_create() should be closed with close(). */
- extern int epoll_create (int __size) __THROW;
-
--/* Same as epoll_create but with an additional FLAGS parameter. */
--extern int epoll_create2 (int __size, int __flags) __THROW;
-+/* Same as epoll_create but with an FLAGS parameter. The unused SIZE
-+ parameter has been dropped. */
-+extern int epoll_create1 (int __flags) __THROW;
-
-
- /* Manipulate an epoll instance "epfd". Returns 0 in case of success,
Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/local-csu-init.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-csu-init.diff 2011-02-07 09:40:16 UTC (rev 4495)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-csu-init.diff 2011-02-07 09:46:32 UTC (rev 4496)
@@ -1,132 +0,0 @@
-2009-04-01 Carlos O'Donell <carlos@codesourcery.com>
-
- * csu/init.c: Rename to ...
- * csu/csu-init.c: ... here.
- * csu/Makefile: Use csu-init.
- * Version.def: Add GLIBC_2.9.
-
-Index: Versions.def
-===================================================================
-RCS file: /cvs/glibc/libc/Versions.def,v
-retrieving revision 1.74
-diff -u -p -r1.74 Versions.def
---- a/Versions.def 3 Dec 2008 04:19:06 -0000 1.74
-+++ b/Versions.def 2 Apr 2009 02:36:54 -0000
-@@ -88,6 +88,7 @@ libpthread {
- GLIBC_2.3.4
- GLIBC_2.4
- GLIBC_2.6
-+ GLIBC_2.9
- GLIBC_PRIVATE
- }
- libresolv {
-Index: csu/init.c
-===================================================================
-RCS file: csu/init.c
-diff -N csu/init.c
---- a/csu/init.c 6 Jul 2001 04:54:45 -0000 1.4
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,27 +0,0 @@
--/* Special startup support.
-- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#if defined USE_IN_LIBIO && defined __GNUC__ && __GNUC__ >= 2
--
--#include <_G_config.h>
--
--/* This records which stdio is linked against in the application. */
--const int _IO_stdin_used = _G_IO_IO_FILE_VERSION;
--
--#endif
-Index: csu/csu-init.c
-===================================================================
-RCS file: csu/csu-init.c
-diff -N csu/csu-init.c
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ b/csu/csu-init.c 2 Apr 2009 02:36:55 -0000
-@@ -0,0 +1,27 @@
-+/* Special startup support.
-+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#if defined USE_IN_LIBIO && defined __GNUC__ && __GNUC__ >= 2
-+
-+#include <_G_config.h>
-+
-+/* This records which stdio is linked against in the application. */
-+const int _IO_stdin_used = _G_IO_IO_FILE_VERSION;
-+
-+#endif
-Index: csu/Makefile
-===================================================================
-RCS file: /cvs/glibc/libc/csu/Makefile,v
-retrieving revision 1.79
-diff -u -p -r1.79 Makefile
---- a/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79
-+++ b/csu/Makefile 2 Apr 2009 02:36:55 -0000
-@@ -40,7 +40,7 @@ omit-deps = $(patsubst %.o,%,$(start-ins
- S$(start-installed-name))
- install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
- distribute = initfini.c gmon-start.c start.c defs.awk \
-- abi-note.S init.c c not-cancel.h
-+ abi-note.S csu-init.c c not-cancel.h
- generated = version-info.h
- before-compile = $(objpfx)version-info.h
-
-@@ -125,7 +125,7 @@ $(objpfx)defs.h: $(objpfx)initfini.s
- endif
-
- ifeq (yes,$(elf))
--extra-objs += abi-note.o init.o
-+extra-objs += abi-note.o csu-init.o
- asm-CPPFLAGS += -I$(objpfx).
- endif
-
-@@ -143,13 +143,13 @@ ifeq (yes,$(elf))
- # We link the ELF startfile along with a SHT_NOTE section indicating
- # the kernel ABI the binaries linked with this library will require.
- $(objpfx)$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
-- $(objpfx)init.o
-+ $(objpfx)csu-init.o
- $(link-relocatable)
- $(objpfx)S$(start-installed-name): $(objpfx)start.os $(objpfx)abi-note.o \
-- $(objpfx)init.o
-+ $(objpfx)csu-init.o
- $(link-relocatable)
- $(objpfx)b$(start-installed-name): $(objpfx)start.ob $(objpfx)abi-note.ob \
-- $(objpfx)init.ob
-+ $(objpfx)csu-init.ob
- $(link-relocatable)
- else
- # The startfile is installed under different names, so we just call our
Deleted: glibc-package/branches/eglibc-2.13/debian/patches/arm/local-hwcap-updates.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/arm/local-hwcap-updates.diff 2011-02-07 09:40:16 UTC (rev 4495)
+++ glibc-package/branches/eglibc-2.13/debian/patches/arm/local-hwcap-updates.diff 2011-02-07 09:46:32 UTC (rev 4496)
@@ -1,47 +0,0 @@
-Add support for some recent ARM hwcaps additions.
----
- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 4 ++--
- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 +-
- ports/sysdeps/unix/sysv/linux/arm/sysdep.h | 3 +++
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
-@@ -47,12 +47,12 @@
- #if !defined PROCINFO_DECL && defined SHARED
- ._dl_arm_cap_flags
- #else
--PROCINFO_CLASS const char _dl_arm_cap_flags[10][10]
-+PROCINFO_CLASS const char _dl_arm_cap_flags[13][10]
- #endif
- #ifndef PROCINFO_DECL
- = {
- "swp", "half", "thumb", "26bit", "fast-mult", "fpa", "vfp", "edsp",
-- "java", "iwmmxt",
-+ "java", "iwmmxt", "crunch", "thumbee", "neon",
- }
- #endif
- #if !defined SHARED || defined PROCINFO_DECL
---- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
-@@ -24,7 +24,7 @@
- #include <ldsodefs.h>
- #include <sysdep.h>
-
--#define _DL_HWCAP_COUNT 10
-+#define _DL_HWCAP_COUNT 13
-
- /* The kernel provides platform data but it is not interesting. */
- #define _DL_HWCAP_PLATFORM 0
---- a/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
-@@ -55,6 +55,9 @@
- #define HWCAP_ARM_EDSP 128
- #define HWCAP_ARM_JAVA 256
- #define HWCAP_ARM_IWMMXT 512
-+#define HWCAP_ARM_CRUNCH 1024
-+#define HWCAP_ARM_THUMBEE 2048
-+#define HWCAP_ARM_NEON 4096
-
- #ifdef __ASSEMBLER__
-
Reply to: