[commits] r1478 - in /branches/eglibc-2_5/libc: ChangeLog.eglibc nptl/sysdeps/pthread/pt-initfini.c sysdeps/unix/sysv/linux/i386/sysdep.h

[kraj@xxxxxxxxxx]

Author: kraj
Date: Fri Feb 16 12:24:24 2007
New Revision: 1478

Log:
Re-define __i686 incase it is pre-defined by GCC.
Convert spaces to tabs in Changelog.

Modified:
    branches/eglibc-2_5/libc/ChangeLog.eglibc
    branches/eglibc-2_5/libc/nptl/sysdeps/pthread/pt-initfini.c
    branches/eglibc-2_5/libc/sysdeps/unix/sysv/linux/i386/sysdep.h

Modified: branches/eglibc-2_5/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_5/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_5/libc/ChangeLog.eglibc Fri Feb 16 12:24:24 2007
@@ -1,3 +1,8 @@
+2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
+	* nptl/sysdeps/pthread/pt-initfini.c: Ditto.
+
 2007-02-05  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Add support for cross-testing.
@@ -88,7 +93,7 @@
 
 	Use the host nm in NPTL tests.
 	* aclocal.m4 (LIBC_PROG_BINUTILS): Find path to 'nm', too.
-        * configure: Regenerated.
+	* configure: Regenerated.
 	* config.make.in: Accept 'nm' path from configure script.
 	* nptl/Makefile (tst-cancel-wrappers.out): Pass 'nm' path to test
 	script.
@@ -110,19 +115,19 @@
 
 2006-12-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
-        * option-groups.def, option-groups.defaults (OPTION_EGLIBC_LOCALES):
-        New option group.
-        * localedata/Makefile: Trim locale lists if
-        OPTION_EGLIBC_LOCALES is not enabled.
-
-        * option-groups.mak: Allow includer to override the option
-        group config file name.
+	* option-groups.def, option-groups.defaults (OPTION_EGLIBC_LOCALES):
+	New option group.
+	* localedata/Makefile: Trim locale lists if
+	OPTION_EGLIBC_LOCALES is not enabled.
+
+	* option-groups.mak: Allow includer to override the option
+	group config file name.
 
 2006-12-08  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Add rudimentary option group support.
 	* option-groups.mak, option-groups.def, option-groups.defaults:
-        New files.
+	New files.
 	* Makerules: Add contents of enabled option groups to the values
 	of the variables 'routines', 'others', 'install-bin',
 	'install-sbin', 'extra-objs', 'tests', and 'test-srcs'.
@@ -297,7 +302,7 @@
 	(write_locale_data): Adjust prototype as for locfile.c change.
 
 2006-08-31  Mark Mitchell  <mark@xxxxxxxxxxxxxxxx>
-            Julian Brown  <julian@xxxxxxxxxxxxxxxx>
+	    Julian Brown  <julian@xxxxxxxxxxxxxxxx>
 
 	* Makefile (headers): Add bits/predefs.h.
 	* include/features.h (__STDC_IEC_559__): Do not define.

Modified: branches/eglibc-2_5/libc/nptl/sysdeps/pthread/pt-initfini.c
==============================================================================
--- branches/eglibc-2_5/libc/nptl/sysdeps/pthread/pt-initfini.c (original)
+++ branches/eglibc-2_5/libc/nptl/sysdeps/pthread/pt-initfini.c Fri Feb 16 12:24:24 2007
@@ -44,6 +44,11 @@
 
 /* Embed an #include to pull in the alignment and .end directives. */
 asm ("\n#include \"defs.h\"");
+
+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
+asm ("\n#undef __i686");
+asm ("\n#define __i686 __i686");
+asm ("\n#endif");
 
 /* The initial common code ends here. */
 asm ("\n/*@HEADER_ENDS*/");

Modified: branches/eglibc-2_5/libc/sysdeps/unix/sysv/linux/i386/sysdep.h
==============================================================================
--- branches/eglibc-2_5/libc/sysdeps/unix/sysv/linux/i386/sysdep.h (original)
+++ branches/eglibc-2_5/libc/sysdeps/unix/sysv/linux/i386/sysdep.h Fri Feb 16 12:24:24 2007
@@ -29,6 +29,10 @@
 #include <dl-sysdep.h>
 #include <tls.h>
 
+#if defined __i686 && defined __ASSEMBLER__
+#undef __i686
+#define __i686 __i686
+#endif
 
 /* For Linux we can use the system call table in the header file
 	/usr/include/asm/unistd.h