r4072 - in glibc-package/trunk/debian: . patches/kfreebsd sysdeps
Author: aurel32
Date: 2010-01-08 13:36:47 +0000 (Fri, 08 Jan 2010)
New Revision: 4072
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2913 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-01-07 23:13:35 UTC (rev 4071)
+++ glibc-package/trunk/debian/changelog 2010-01-08 13:36:47 UTC (rev 4072)
@@ -1,3 +1,10 @@
+eglibc (2.10.2-6) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2913 (from glibc-bsd).
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 08 Jan 2010 14:36:13 +0100
+
eglibc (2.10.2-5) unstable; urgency=low
[ Petr Salinger]
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-01-07 23:13:35 UTC (rev 4071)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-01-08 13:36:47 UTC (rev 4072)
@@ -13313,7 +13313,7 @@
+#endif /* !PIC */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h
-@@ -0,0 +1,235 @@
+@@ -0,0 +1,240 @@
+/* Copyright (C) 1992,1993,1995-2000,2002,2003,2004
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -13345,6 +13345,11 @@
+#include <dl-sysdep.h>
+#include <tls.h>
+
++#if defined __i686 && defined __ASSEMBLER__
++#undef __i686
++#define __i686 __i686
++#endif
++
+#ifdef __ASSEMBLER__
+
+/* We don't want the label for the error handle to be global when we define
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2010-01-07 23:13:35 UTC (rev 4071)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2010-01-08 13:36:47 UTC (rev 4072)
@@ -17,7 +17,7 @@
i386_CC = $(CC) -m32
i386_CXX = $(CXX) -m32
i386_add-ons = ports linuxthreads $(add-ons)
-i386_extra_cflags = -march=pentium4 -mtune=generic
+i386_extra_cflags = -march=i686 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp
i386_includedir = /usr/include/i486-kfreebsd-gnu
i386_rtlddir = /lib
Reply to: