diff --git a/configs/c5471evm/scripts/Make.defs b/configs/c5471evm/scripts/Make.defs
index bbe527860ae..25bd4e00892 100644
--- a/configs/c5471evm/scripts/Make.defs
+++ b/configs/c5471evm/scripts/Make.defs
@@ -65,7 +65,15 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ifeq ($(OLDGCC),n)
 ifneq ($(HOSTOS),Cygwin)
   OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
@@ -79,7 +87,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
 else
   ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
diff --git a/configs/ea3131/pgnsh/Make.defs b/configs/ea3131/pgnsh/Make.defs
index aa4ce223e72..d75aa7e8daa 100644
--- a/configs/ea3131/pgnsh/Make.defs
+++ b/configs/ea3131/pgnsh/Make.defs
@@ -65,6 +65,14 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
@@ -73,7 +81,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
 else
   ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
diff --git a/configs/ea3131/scripts/Make.defs b/configs/ea3131/scripts/Make.defs
index 5508ef56c0a..c3a1896bb6a 100644
--- a/configs/ea3131/scripts/Make.defs
+++ b/configs/ea3131/scripts/Make.defs
@@ -65,6 +65,14 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
@@ -73,7 +81,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
 else
   ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
diff --git a/configs/ea3152/scripts/Make.defs b/configs/ea3152/scripts/Make.defs
index 5d899560b42..4be2b26d093 100644
--- a/configs/ea3152/scripts/Make.defs
+++ b/configs/ea3152/scripts/Make.defs
@@ -65,6 +65,14 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
@@ -73,7 +81,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
 else
   ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
diff --git a/configs/mcu123-lpc214x/scripts/Make.defs b/configs/mcu123-lpc214x/scripts/Make.defs
index 4203628a1b7..abb1b21624c 100644
--- a/configs/mcu123-lpc214x/scripts/Make.defs
+++ b/configs/mcu123-lpc214x/scripts/Make.defs
@@ -65,7 +65,15 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ifeq ($(OLDGCC),n)
 ifneq ($(HOSTOS),Cygwin)
   OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
@@ -79,7 +87,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
 else
   ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
diff --git a/configs/mx1ads/scripts/Make.defs b/configs/mx1ads/scripts/Make.defs
index d9fa63ea74c..2a8af2aa029 100644
--- a/configs/mx1ads/scripts/Make.defs
+++ b/configs/mx1ads/scripts/Make.defs
@@ -37,73 +37,81 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
 
-CROSSDEV		= arm-nuttx-elf-
-CC			= $(CROSSDEV)gcc
-CXX			= $(CROSSDEV)g++
-CPP			= $(CROSSDEV)gcc -E
-LD			= $(CROSSDEV)ld
-AR			= $(CROSSDEV)ar rcs
-NM			= $(CROSSDEV)nm
-OBJCOPY			= $(CROSSDEV)objcopy
-OBJDUMP			= $(CROSSDEV)objdump
+CROSSDEV = arm-nuttx-elf-
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
 
-ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ARCHCFLAGS		= -fno-builtin
-ARCHCXXFLAGS		= -fno-builtin -fno-exceptions -fcheck-new
-ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow -Wundef
-ARCHWARNINGSXX		= -Wall -Wshadow -Wundef
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION	= -g
+  ARCHOPTIMIZATION = -g
 endif
 
 ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
-  ARCHCPUFLAGS		= -mtune=arm920t -march=armv4t -mfloat-abi=soft
+ifeq ($(OLDGCC),n)
+  ARCHCPUFLAGS = -mtune=arm920t -march=armv4t -mfloat-abi=soft
 else
-  ARCHCPUFLAGS		= -mapcs-32 -mtune=arm920t -march=armv4t -msoft-float
+  ARCHCPUFLAGS = -mapcs-32 -mtune=arm920t -march=armv4t -msoft-float
 endif
-ARCHDEFINES		=
-ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHXXINCLUDES		= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
 
-ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/mx1ads.ld
+ARCHDEFINES =
+ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
 
-CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/mx1ads.ld
 
-NXFLATLDFLAGS1		= -r -d -warn-common
-NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-			  -no-check-sections
-LDNXFLATFLAGS		= -e main -s 2048
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
-ASMEXT			= .S
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
+   -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+   -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS += -g
 endif
 
+MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
 
-MKDEP			= $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-
-HOSTCC			= gcc
-HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS		=
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
 
diff --git a/configs/ntosd-dm320/scripts/Make.defs b/configs/ntosd-dm320/scripts/Make.defs
index c43fb6821c9..5a610f09310 100644
--- a/configs/ntosd-dm320/scripts/Make.defs
+++ b/configs/ntosd-dm320/scripts/Make.defs
@@ -67,6 +67,14 @@ LDNXFLAT = ldnxflat
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
@@ -75,49 +83,48 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
-  ARCHCPUFLAGS		= -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
+ifeq ($(OLDGCC),n)
+  ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
 else
-  ARCHCPUFLAGS		= -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
+  ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
 endif
 
-ARCHCFLAGS		= -fno-builtin
-ARCHCXXFLAGS		= -fno-builtin -fno-exceptions -fcheck-new
-ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
-ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow -Wundef
-ARCHWARNINGSXX		= -Wall -Wshadow -Wundef
-ARCHDEFINES		=
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
 
-CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
-NXFLATLDFLAGS1		= -r -d -warn-common
-NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-			  -no-check-sections
-LDNXFLATFLAGS		= -e main -s 2048
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
+   -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+   -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
 
-ASMEXT			= .S
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
 
 ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS += -g
 endif
 
-
-HOSTCC			= gcc
-HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS		=
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
 
diff --git a/configs/olimex-lpc-h3131/scripts/Make.defs b/configs/olimex-lpc-h3131/scripts/Make.defs
index ce673b79d0b..a6983defd54 100644
--- a/configs/olimex-lpc-h3131/scripts/Make.defs
+++ b/configs/olimex-lpc-h3131/scripts/Make.defs
@@ -65,6 +65,14 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
@@ -73,7 +81,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mtune=arm9tdmi -march=armv5te -mfloat-abi=soft -fno-builtin
 else
   ARCHCPUFLAGS = -mapcs-32 -mtune=arm9tdmi -march=armv5te -msoft-float -fno-builtin
diff --git a/configs/olimex-lpc2378/scripts/Make.defs b/configs/olimex-lpc2378/scripts/Make.defs
index 732e96af717..33c4b70bc21 100644
--- a/configs/olimex-lpc2378/scripts/Make.defs
+++ b/configs/olimex-lpc2378/scripts/Make.defs
@@ -70,7 +70,15 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ifeq ($(OLDGCC),n)
 ifneq ($(HOSTOS),Cygwin)
   OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
@@ -84,7 +92,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
 else
   ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
diff --git a/configs/olimex-strp711/scripts/Make.defs b/configs/olimex-strp711/scripts/Make.defs
index 05d5617f09e..bfd8acc0c2d 100644
--- a/configs/olimex-strp711/scripts/Make.defs
+++ b/configs/olimex-strp711/scripts/Make.defs
@@ -65,7 +65,15 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ifeq ($(OLDGCC),n)
 ifneq ($(HOSTOS),Cygwin)
   OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
@@ -79,7 +87,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
 else
   ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
diff --git a/configs/zp214xpa/scripts/Make.defs b/configs/zp214xpa/scripts/Make.defs
index d8db68c33c0..bde9f604edf 100644
--- a/configs/zp214xpa/scripts/Make.defs
+++ b/configs/zp214xpa/scripts/Make.defs
@@ -65,7 +65,15 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(ARCHCCMAJOR),2)
+  OLDGCC = y
+else ifeq ($(ARCHCCMAJOR),3)
+  OLDGCC = y
+else
+  OLDGCC = n
+endif
+
+ifeq ($(OLDGCC),n)
 ifneq ($(HOSTOS),Cygwin)
   OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
@@ -79,7 +87,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ifeq ($(ARCHCCMAJOR),4)
+ifeq ($(OLDGCC),n)
   ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
 else
   ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float