From 4c27f4c83b6d0c0792fa51606f8a0164f3383303 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 11 Dec 2007 20:56:39 +0000
Subject: [PATCH] Simplified code. Added flag for 32/64 bit. GNU_TARGET now in
 CONFIG_SITE*.

---
 configure/os/CONFIG.Common.linux-x86    | 23 +++++----------------
 configure/os/CONFIG.Common.linux-x86_64 | 27 +++++++++----------------
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86
index 72c72db0a..7dc57948f 100644
--- a/configure/os/CONFIG.Common.linux-x86
+++ b/configure/os/CONFIG.Common.linux-x86
@@ -13,23 +13,10 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = x86
 
 ARCH_DEP_CPPFLAGS += -D_X86_
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
-ifeq ($(BUILD_CLASS),CROSS)
-ifeq ($(EPICS_HOST_ARCH),linux-x86)
-   # Added for 386,486,... cross builds
-   CMPLR_PREFIX=
-   CROSS_INCLUDES=
-   CROSS_LDFLAGS=
-   # Use -w not -Wall
-   #WARN_CFLAGS_YES = -w
-   #WARN_CXXFLAGS_YES = -w
--include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
--include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
-else
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-endif
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. x86-redhat-linux-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-x86 file, e.g. GNU_TARGET=x86-redhat-linux
 
diff --git a/configure/os/CONFIG.Common.linux-x86_64 b/configure/os/CONFIG.Common.linux-x86_64
index daa4368d8..564828b47 100644
--- a/configure/os/CONFIG.Common.linux-x86_64
+++ b/configure/os/CONFIG.Common.linux-x86_64
@@ -13,23 +13,14 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = x86_64
 
 ARCH_DEP_CPPFLAGS += -D_X86_64_
+ARCH_DEP_CFLAGS += -m64
+ARCH_DEP_LDFLAGS += -m64
 
-ifeq ($(BUILD_CLASS),CROSS)
-ifeq ($(EPICS_HOST_ARCH),linux-x86_64)
-   # Added for 386,486,... cross builds
-   CMPLR_PREFIX=
-   CROSS_INCLUDES=
-   CROSS_LDFLAGS=
-   # Use -w not -Wall
-   #WARN_CFLAGS_YES = -w
-   #WARN_CXXFLAGS_YES = -w
--include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86_64
--include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
--include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.linux-x86_64
-else
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-endif
+#ifeq ($(BUILD_CLASS),CROSS)
+#  VALID_BUILDS = Ioc
+#endif
+
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. x86_64-redhat-linux-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-x86_64 file, e.g. GNU_TARGET=x86_64-redhat-linux