* sysdeps/wordsize-32/Makefile (CPPFLAGS-divdi3.c): Set to

	-Din_divdi3_c.
	* sysdeps/wordsize-32/symbol-hacks.h: Skip if in_divdi3_c is defined.

diff --git a/ChangeLog b/ChangeLog
index 1b3ccb92cac562df02a429357c02a0ab3b5bb4cb..c8af2699bbea68d7ce8268902a7e38338e30c1d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/wordsize-32/Makefile (CPPFLAGS-divdi3.c): Set to
+       -Din_divdi3_c.
+       * sysdeps/wordsize-32/symbol-hacks.h: Skip if in_divdi3_c is defined.
+
 2005-11-16  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/fchownat.c: Include string.h.

diff --git a/sysdeps/wordsize-32/Makefile b/sysdeps/wordsize-32/Makefile
index b50c0b1635972ccad7ebf89d8a298f6dcef1faf2..82beac44edd6c86d1a98359ce53e9e30b50e5adf 100644 (file)
--- a/sysdeps/wordsize-32/Makefile
+++ b/sysdeps/wordsize-32/Makefile
@@ -2,5 +2,6 @@ ifeq ($(subdir),csu)
 ifeq (yes,$(build-shared))
 sysdep_routines += divdi3
 shared-only-routines += divdi3
+CPPFLAGS-divdi3.c = -Din_divdi3_c
 endif
 endif

diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h
index ee53e1257f8e4cf6057dde70de24f3906f421b11..c167cb94724be2931fb4e20e843fffe489cbb92c 100644 (file)
--- a/sysdeps/wordsize-32/symbol-hacks.h
+++ b/sysdeps/wordsize-32/symbol-hacks.h
@@ -22,7 +22,7 @@
    therefore we get PLTs.  Unnecessarily so.  Changing gcc is a big
    task which might not be worth it so we play tricks with the
    assembler.  */
-#if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED
+#if !defined __ASSEMBLER__ && !defined in_divdi3_c && !defined NOT_IN_libc && defined SHARED
 asm ("__divdi3 = __divdi3_internal");
 asm ("__udivdi3 = __udivdi3_internal");
 asm ("__moddi3 = __moddi3_internal");