diff options
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | config.mk | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4272844d47b..af6e115dcfa 100644 --- 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 b1e1d8f149c..c7b841da593 100644 --- 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) |