about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/i386/Makefile6
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 992ec54fbe..1e39c44efd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-30  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/i386/Makefile [csu]: Define CFLAGS-initfini.s to force
+	compiling for i386 to avoid i686-like GOT pointer computation.
+
 	* db2/db_int.h: Change tsl_t type to u_int32_t.
 	* db2/mutex/mutex.c: Allow Alpha mutex definitions.
 	* db2/mutex/alpha.h: New file.
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 9860444b85..1d62d10d8a 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -5,6 +5,12 @@ asm-CPPFLAGS += -DGAS_SYNTAX
 # The i386 `long double' is a distinct type we support.
 long-double-fcts = yes
 
+ifeq ($(subdir),csu)
+# On i686 we must avoid generating the trampoline functions generated
+# to get the GOT pointer.
+CFLAGS-initfini.s += -march=i386
+endif
+
 ifeq ($(subdir),db2)
 CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_X86_GCC=1
 endif