avr32: Print unrelocated PC on exception

[karo-tx-uboot.git] / config.mk

diff --git a/config.mk b/config.mk
index c4ad223bfacb41c777f306a8520ab825fb145385..eb95093f46465a8b984ce871d70218418615989a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -68,13 +68,13 @@ ifeq ($(HOSTOS),darwin)
 DARWIN_MAJOR_VERSION   = $(shell sw_vers -productVersion | cut -f 1 -d '.')
 DARWIN_MINOR_VERSION   = $(shell sw_vers -productVersion | cut -f 2 -d '.')
 
-before-snow-leopard    = $(shell if [ $(DARWIN_MAJOR_VERSION) -le 10 -a \
-       $(DARWIN_MINOR_VERSION) -le 5 ] ; then echo "$(1)"; else echo "$(2)"; fi ;)
+os_x_before    = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
+       $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
 
 # Snow Leopards build environment has no longer restrictions as described above
-HOSTCC          = $(call before-snow-leopard, "cc", "gcc")
-HOSTCFLAGS     += $(call before-snow-leopard, "-traditional-cpp")
-HOSTLDFLAGS    += $(call before-snow-leopard, "-multiply_defined suppress")
+HOSTCC          = $(call os_x_before, 10, 5, "cc", "gcc")
+HOSTCFLAGS     += $(call os_x_before, 10, 4, "-traditional-cpp")
+HOSTLDFLAGS    += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 else
 HOSTCC         = gcc
 endif
@@ -191,14 +191,6 @@ endif
 
 CFLAGS += $(call cc-option,-fno-stack-protector)
 
-# avoid trigraph warnings while parsing pci.h (produced by NIOS gcc-2.9)
-# this option have to be placed behind -Wall -- that's why it is here
-ifeq ($(ARCH),nios)
-ifeq ($(findstring 2.9,$(shell $(CC) --version)),2.9)
-CFLAGS := $(CPPFLAGS) -Wall -Wno-trigraphs
-endif
-endif
-
 # $(CPPFLAGS) sets -g, which causes gcc to pass a suitable -g<format>
 # option to the assembler.
 AFLAGS_DEBUG :=