diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-07-22 13:23:08 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-22 14:41:23 +0200 |
| commit | 3aba072d90b500e76f7f1cb06c659fb3cf02c6b8 (patch) | |
| tree | 7fe239958444358640691c72f8af411534a2f6d4 | |
| parent | 64322469ecb5746709e560f36dbc740c1300f978 (diff) | |
| download | glibc-3aba072d90b500e76f7f1cb06c659fb3cf02c6b8.tar.gz glibc-3aba072d90b500e76f7f1cb06c659fb3cf02c6b8.tar.xz glibc-3aba072d90b500e76f7f1cb06c659fb3cf02c6b8.zip | |
Undefine __i686 on x86.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makeconfig | 6 | ||||
| -rw-r--r-- | sysdeps/i386/Makefile | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ab6f980177..7b450994f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-22 Jakub Jelinek <jakub@redhat.com> + + * Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS). + * sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686. + 2009-07-21 Ulrich Drepper <drepper@redhat.com> * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove diff --git a/Makeconfig b/Makeconfig index 9f134cc137..2ebe184224 100644 --- a/Makeconfig +++ b/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS ifeq ($(have-cpp-asm-debuginfo),yes) -ASFLAGS := $(filter -g%,$(CFLAGS)) +ASFLAGS = $(filter -g%,$(CFLAGS)) else -ASFLAGS := +ASFLAGS = endif endif -ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) +ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) $(sysdep-ASFLAGS) ifndef BUILD_CC BUILD_CC = $(CC) diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index 5f0d9bea21..8cac74a6ae 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX +sysdep-ASFLAGS += -U__i686 + # The i386 `long double' is a distinct type we support. long-double-fcts = yes |