Improved x86-64 config making the multilib ABIs and default userland ABI chooseable

architecture/x86-64/config.in

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: architecture/x86-64/config.in
-# Copyright (C) 2014 The OpenSDE Project
+# Copyright (C) 2008 - 2014 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -38,3 +38,15 @@ choice SDECFG_X8664_OPT generic   \
 if [ $SDECFG_X8664_OPT != generic ] ; then
 	SDECFG_ID="$SDECFG_ID-$SDECFG_X8664_OPT"
 fi
+
+if [ "$SDECFG_MULTILIB" == 1 ]; then
+	eval SDECFG_ABI_$SDECFG_ABI_DEFAULT="1"
+	comment '- Available multilib ABIs'
+	bool "64  (64bit)"	SDECFG_ABI_64  1
+	bool "32  (32bit)"	SDECFG_ABI_32  1
+fi
+
+comment '- Default userland ABI' 
+choice SDECFG_ABI_DEFAULT 64	\
+	64 "64bit"		\
+	32 "32bit"