Fix gcc 3.4.x AFLAGS setting for m68k platform.

diff --git a/CHANGELOG b/CHANGELOG
index 4272844d47bca6ffca047136033db0656279710f..af6e115dcfac1d1b845a3996c47e9189480d8a92 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix gcc 3.4.x AFLAGS setting for m68k platform.
+
 * Enable autoboot for M5271EVB board.
 
 * Changed default ramdisk addr in yosemite/yellowstone ports

diff --git a/config.mk b/config.mk
index b1e1d8f149c5794c2f7d9d818862e7ea5affcb7e..c7b841da5938902d1582a378be039ab363ccf187 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -143,14 +143,15 @@ CFLAGS := $(CPPFLAGS) -Wall -Wno-trigraphs
 endif
 endif
 
+AFLAGS_DEBUG := -Wa,-gstabs
+
 # turn jbsr into jsr for m68k
 ifeq ($(ARCH),m68k)
 ifeq ($(findstring 3.4,$(shell $(CC) --version)),3.4)
 AFLAGS_DEBUG := -Wa,-gstabs,-S
 endif
-else
-AFLAGS_DEBUG := -Wa,-gstabs
 endif
+
 AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
 
 LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)