Author: sthibault
Date: 2011-10-28 23:48:19 +0000 (Fri, 28 Oct 2011)
New Revision: 5013
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-ldsodefs.h.diff
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: Move commited part to
patches/hurd-i386/cvs-ldsodefs.h.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-10-28 23:46:30 UTC (rev
5012)
+++ glibc-package/trunk/debian/changelog 2011-10-28 23:48:19 UTC (rev
5013)
@@ -24,6 +24,8 @@
tg-tg-____longjmp_chk.diff.
* patches/hurd-i386/submitted-libc_once.diff: Move kfreebsd part to
patches/kfreebsd/submitted-libc_once.diff.
+ * patches/hurd-i386/submitted-ldsodefs.h.diff: Move commited part to
+ patches/hurd-i386/cvs-ldsodefs.h.diff
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3763 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-ldsodefs.h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-ldsodefs.h.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-ldsodefs.h.diff
2011-10-28 23:48:19 UTC (rev 5013)
@@ -0,0 +1,24 @@
+http://sourceware.org/ml/libc-alpha/2011-06/msg00087.html
+
+binutils started emitting ELF files with ELFOSABI_GNU due to GNU-specific
+ELF extensions. We need to accept loading such binaries on hurd-i386 too.
+
+2011-06-19 Samuel Thibault <[email protected]>
+
+ * elf/elf.h (ELFOSABI_GNU): Define macro.
+ (ELFOSABI_LINUX): Comment that it is just an alias for ELFOSABI_GNU.
+
+diff --git a/elf/elf.h b/elf/elf.h
+index acb7762..cad15cd 100644
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -142,7 +142,8 @@ typedef struct
+ #define ELFOSABI_SYSV 0 /* Alias. */
+ #define ELFOSABI_HPUX 1 /* HP-UX */
+ #define ELFOSABI_NETBSD 2 /* NetBSD. */
+-#define ELFOSABI_LINUX 3 /* Linux. */
++#define ELFOSABI_GNU 3 /* GNU. */
++#define ELFOSABI_LINUX 3 /* Alias for ELFOSABI_GNU. */
+ #define ELFOSABI_SOLARIS 6 /* Sun Solaris. */
+ #define ELFOSABI_AIX 7 /* IBM AIX. */
+ #define ELFOSABI_IRIX 8 /* SGI Irix. */
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
2011-10-28 23:46:30 UTC (rev 5012)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
2011-10-28 23:48:19 UTC (rev 5013)
@@ -5,8 +5,6 @@
2011-06-19 Samuel Thibault <[email protected]>
- * elf/elf.h (ELFOSABI_GNU): Define macro.
- (ELFOSABI_LINUX): Comment that it is just an alias for ELFOSABI_GNU.
* 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.
@@ -19,20 +17,6 @@
t/elfosabi_gnu, except the first hook which is in cvs.
-diff --git a/elf/elf.h b/elf/elf.h
-index acb7762..cad15cd 100644
---- a/elf/elf.h
-+++ b/elf/elf.h
-@@ -142,7 +142,8 @@ typedef struct
- #define ELFOSABI_SYSV 0 /* Alias. */
- #define ELFOSABI_HPUX 1 /* HP-UX */
- #define ELFOSABI_NETBSD 2 /* NetBSD. */
--#define ELFOSABI_LINUX 3 /* Linux. */
-+#define ELFOSABI_GNU 3 /* GNU. */
-+#define ELFOSABI_LINUX 3 /* Alias for ELFOSABI_GNU. */
- #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
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-10-28 23:46:30 UTC (rev
5012)
+++ glibc-package/trunk/debian/patches/series 2011-10-28 23:48:19 UTC (rev
5013)
@@ -145,6 +145,7 @@
hurd-i386/local-ED.diff
hurd-i386/unsubmitted-pthread_posix-option.diff
hurd-i386/local-madvise_warn.diff
+hurd-i386/cvs-ldsodefs.h.diff
hurd-i386/submitted-ldsodefs.h.diff
hurd-i386/submitted-init-first.diff
hurd-i386/submitted-hurdsig-fixes.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
