2009-07-22  Jakub Jelinek  <jakub@redhat.com>

	* Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).
	* sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.

diff --git a/Makeconfig b/Makeconfig
index 9f134cc..2ebe184 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 ef45ce6..6371ba4 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