diff --git a/base/gcc/arch/options.arm.in b/base/gcc/arch/options.arm.in
index e84208206..de42bafa1 100644
--- a/base/gcc/arch/options.arm.in
+++ b/base/gcc/arch/options.arm.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/arch/options.arm.in
-# Copyright (C) 2008 The OpenSDE Project
+# Copyright (C) 2008 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -13,8 +13,17 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-[ "$SDECFG_ARM_OPT" != generic ] &&
+if [ "$SDECFG_ARM_OPT" != generic ]; then
 	var_append GCC_WRAPPER_INSERT " " "-mcpu=$SDECFG_ARM_OPT"
+else
+	var_append GCC_WRAPPER_INSERT " " "-mabi=$SDECFG_ARM_ABI"
+	var_append GCC_WRAPPER_INSERT " " "-m$SDECFG_ARM_ENDIANESS"
+	var_append GCC_WRAPPER_INSERT " " "-march=$SDECFG_ARM_ARCH"
+	var_append GCC_WRAPPER_INSERT " " "-mfloat-abi=$SDECFG_ARM_FLOAT_ABI"
+	if [ "$SDECFG_ARM_FLOAT_ABI" == hard ]; then
+		var_append GCC_WRAPPER_INSERT " " "-mfpu=$SDECFG_ARM_FPU"
+	fi
+fi
 
 [ "$SDECFG_ARM_THUMB" = 1 ] &&
 	var_append GCC_WRAPPER_INSERT " " "-mthumb -mthumb-interwork -D__arm__"