From 1f73716d5c6eda1c51cf5da82adccc1086bb8981 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 28 Apr 2015 11:27:06 -0500 Subject: [PATCH] Adjust linux-x86 & -x86_64 flags Moved -m64 from ARCH_DEP_*FLAGS to OP_SYS_*FLAGS where it is on -x86. Added GNU_TUNE_CFLAGS to -x86_64, adjust related comments Added -D_FILE_OFFSET_BITS=64 to -x86 builds --- configure/os/CONFIG.Common.linux-x86_64 | 6 ++++-- configure/os/CONFIG_SITE.Common.linux-x86 | 11 +++++++---- configure/os/CONFIG_SITE.Common.linux-x86_64 | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configure/os/CONFIG.Common.linux-x86_64 b/configure/os/CONFIG.Common.linux-x86_64 index e798de23f..8bc88efb3 100644 --- a/configure/os/CONFIG.Common.linux-x86_64 +++ b/configure/os/CONFIG.Common.linux-x86_64 @@ -12,9 +12,11 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = x86_64 +ARCH_DEP_CFLAGS = $(GNU_TUNE_CFLAGS) ARCH_DEP_CPPFLAGS += -D_X86_64_ -ARCH_DEP_CFLAGS += -m64 -ARCH_DEP_LDFLAGS += -m64 + +OP_SYS_CFLAGS += -m64 +OP_SYS_LDFLAGS += -m64 # If your crosscompiler name has a GNU target prefix like -gcc, # e.g. x86_64-redhat-linux-gcc, put a GNU_TARGET definition in diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86 index 22f43822e..a1d64726c 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86 +++ b/configure/os/CONFIG_SITE.Common.linux-x86 @@ -12,7 +12,7 @@ # a) LD_LIBRARY_PATH must include the full absolute pathname to # $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base # executables. -# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which +# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which # will add the named directory to the list contained in the executables. # c) Add the runtime path to /etc/ld.so.conf and run ldconfig # to inform the system of the shared library location. @@ -33,6 +33,10 @@ COMMANDLINE_LIBRARY = READLINE #COMMANDLINE_LIBRARY = READLINE_CURSES +# Permit access to 64-bit file-systems +OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64 + + # Uncomment the followings lines to build with CLANG instead of GCC. # #GNU = NO @@ -49,7 +53,6 @@ OPT_CFLAGS_YES += -g OPT_CXXFLAGS_YES += -g -# Tune GNU compiler output for a specific cpu-type -# (e.g. generic, i386, i486, i586, or i686) +# Tune GNU compiler output for a specific 32-bit cpu-type +# (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.) GNU_TUNE_CFLAGS = -mtune=generic - diff --git a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64 index 482253242..5e31809c0 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86_64 +++ b/configure/os/CONFIG_SITE.Common.linux-x86_64 @@ -47,3 +47,8 @@ COMMANDLINE_LIBRARY = READLINE # loaded into RAM when the binary is loaded. OPT_CFLAGS_YES += -g OPT_CXXFLAGS_YES += -g + + +# Tune GNU compiler output for a specific 64-bit cpu-type +# (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.) +GNU_TUNE_CFLAGS = -mtune=generic