r4385 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2010-08-22 14:51:43 +0000 (Sun, 22 Aug 2010)
New Revision: 4385
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-i686.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/hurd-i386/local-i686.diff: New patch to fix i686 build.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-08-22 14:04:00 UTC (rev 4384)
+++ glibc-package/trunk/debian/changelog 2010-08-22 14:51:43 UTC (rev 4385)
@@ -8,6 +8,7 @@
locales.
* mv patches/hurd-i386/{submitted,cvs}-ttyname.diff.
* mv patches/hurd-i386/{submitted,cvs}-getnprocs.diff.
+ * patches/hurd-i386/local-i686.diff: New patch to fix i686 build.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3156 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/hurd-i386/local-i686.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-i686.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-i686.diff 2010-08-22 14:51:43 UTC (rev 4385)
@@ -0,0 +1,22 @@
+2010-08-22 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/i386/sysdep.h [__ASSEMBLER__] (__i686): New macro.
+
+---
+ sysdep.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/mach/i386/sysdep.h.orig 2010-08-22 16:44:46.000000000 +0200
++++ b/sysdeps/mach/i386/sysdep.h 2010-08-22 16:45:35.000000000 +0200
+@@ -22,6 +22,11 @@
+ #include <dl-sysdep.h>
+ #include <tls.h>
+
++#if defined __i686 && defined __ASSEMBLER__
++#undef __i686
++#define __i686 __i686
++#endif
++
+ #define LOSE asm volatile ("hlt")
+
+ #define SNARF_ARGS(entry_sp, argc, argv, envp) \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-08-22 14:04:00 UTC (rev 4384)
+++ glibc-package/trunk/debian/patches/series 2010-08-22 14:51:43 UTC (rev 4385)
@@ -128,6 +128,7 @@
hurd-i386/cvs-getnprocs.diff
hurd-i386/local-mkdir_root.diff
hurd-i386/cvs-select.diff
+hurd-i386/local-i686.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
Reply to: