Author: sthibault
Date: 2011-07-03 14:22:20 +0000 (Sun, 03 Jul 2011)
New Revision: 4778
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/submitted-ldsodefs.h.diff: Update to latest submitted
version, enable. Closes: #630180.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-03 14:21:29 UTC (rev
4777)
+++ glibc-package/trunk/debian/changelog 2011-07-03 14:22:20 UTC (rev
4778)
@@ -5,7 +5,9 @@
* Rename most local hurd-i386 patches into unsubmitted.
* patches/hurd-i386/submitted-PTRACE_CONTINUE.diff: New patch from Jeremy
Koenig, to fix initialized value.
-
+ * patches/hurd-i386/submitted-ldsodefs.h.diff: Update to latest submitted
+ version, enable. Closes: #630180.
+
[ Aurelien Jarno ]
* debhelper.in/libc.preinst: replace unbreakable space by normal space.
Closes: #632453.
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
2011-07-03 14:21:29 UTC (rev 4777)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
2011-07-03 14:22:20 UTC (rev 4778)
@@ -10,6 +10,9 @@
* sysdeps/mach/hurd/ldsodefs.h: New file, defines VALID_ELF_HEADER,
VALID_ELF_OSABI, VALID_ELF_ABIVERSION, MORE_ELF_HEADER_DATA, declares
_dl_non_dynamic_init.
+ * sysdeps/unix/sysv/linux/ldsodefs.h (VALID_ELF_OSABI,
+ VALID_ELF_ABIVERSION, MORE_ELF_HEADER_DATA): Use ELFOSABI_GNU instead
of
+ ELFOSABI_LINUX.
* sysdeps/mach/hurd/powerpc/init-first.c (_dl_non_dynamic_init): Remove
declaration.
* sysdeps/mach/hurd/i386/init-first.c (_dl_non_dynamic_init): Likewise.
@@ -28,20 +31,6 @@
#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */
#define ELFOSABI_AIX 7 /* IBM AIX. */
#define ELFOSABI_IRIX 8 /* SGI Irix. */
-diff --git a/sysdeps/mach/hurd/i386/init-first.c
b/sysdeps/mach/hurd/i386/init-first.c
-index e79af1d..7c86609 100644
---- a/sysdeps/mach/hurd/i386/init-first.c
-+++ b/sysdeps/mach/hurd/i386/init-first.c
-@@ -37,9 +37,6 @@ extern void __init_misc (int, char **, char **);
- #ifdef USE_NONOPTION_FLAGS
- extern void __getopt_clean_environment (char **);
- #endif
--#ifndef SHARED
--extern void _dl_non_dynamic_init (void) internal_function;
--#endif
- extern void __libc_global_ctors (void);
-
- unsigned int __hurd_threadvar_max;
diff --git a/sysdeps/mach/hurd/ldsodefs.h b/sysdeps/mach/hurd/ldsodefs.h
index e69de29..56e4b03 100644
--- a/sysdeps/mach/hurd/ldsodefs.h
@@ -99,6 +88,31 @@
+ }
+
+#endif /* ldsodefs.h */
+diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h
b/sysdeps/unix/sysv/linux/ldsodefs.h
+index 5d5b1b4..cf20217 100644
+--- a/sysdeps/unix/sysv/linux/ldsodefs.h
++++ b/sysdeps/unix/sysv/linux/ldsodefs.h
+@@ -58,9 +58,9 @@ extern void _dl_non_dynamic_init (void) internal_function;
+ #define VALID_ELF_HEADER(hdr,exp,size) (memcmp (hdr, exp, size) == 0
\
+ || memcmp (hdr, expected2, size) == 0)
+ #define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV \
+- || osabi == ELFOSABI_LINUX)
++ || osabi == ELFOSABI_GNU)
+ #define VALID_ELF_ABIVERSION(osabi,ver) \
+- (ver == 0 || (osabi == ELFOSABI_LINUX && ver < LIBC_ABI_MAX))
++ (ver == 0 || (osabi == ELFOSABI_GNU && ver < LIBC_ABI_MAX))
+ #define MORE_ELF_HEADER_DATA \
+ static const unsigned char expected2[EI_PAD] = \
+ { \
+@@ -71,7 +71,7 @@ extern void _dl_non_dynamic_init (void) internal_function;
+ [EI_CLASS] = ELFW(CLASS), \
+ [EI_DATA] = byteorder, \
+ [EI_VERSION] = EV_CURRENT, \
+- [EI_OSABI] = ELFOSABI_LINUX \
++ [EI_OSABI] = ELFOSABI_GNU \
+ }
+
+ #endif /* ldsodefs.h */
diff --git a/sysdeps/mach/hurd/powerpc/init-first.c
b/sysdeps/mach/hurd/powerpc/init-first.c
index 21b5054..2047cac 100644
--- a/sysdeps/mach/hurd/powerpc/init-first.c
@@ -113,3 +127,17 @@
extern void __libc_global_ctors (void);
unsigned int __hurd_threadvar_max;
+diff --git a/sysdeps/mach/hurd/i386/init-first.c
b/sysdeps/mach/hurd/i386/init-first.c
+index e79af1d..7c86609 100644
+--- a/sysdeps/mach/hurd/i386/init-first.c
++++ b/sysdeps/mach/hurd/i386/init-first.c
+@@ -37,9 +37,6 @@ extern void __init_misc (int, char **, char **);
+ #ifdef USE_NONOPTION_FLAGS
+ extern void __getopt_clean_environment (char **);
+ #endif
+-#ifndef SHARED
+-extern void _dl_non_dynamic_init (void) internal_function;
+-#endif
+ extern void __libc_global_ctors (void);
+
+ unsigned int __hurd_threadvar_max;
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-07-03 14:21:29 UTC (rev
4777)
+++ glibc-package/trunk/debian/patches/series 2011-07-03 14:22:20 UTC (rev
4778)
@@ -140,6 +140,7 @@
hurd-i386/unsubmitted-pthread_posix-option.diff
hurd-i386/local-madvise_warn.diff
hurd-i386/submitted-PTRACE_CONTINUE.diff
+hurd-i386/submitted-ldsodefs.h.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qdnyy-0007uk...@vasks.debian.org
