From 6b8515b860705b28e73d00a1c9cabbe22c509e1e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 30 Mar 2012 14:37:57 -0500 Subject: [PATCH] configure: Reformat/reword comments in CONFIG_SITE Also moved the GNU_TUNE_CFLAGS setting into the file os/CONFIG_SITE.Common.linux-x86 since it is arch-specific. --- configure/CONFIG_SITE | 87 +++++++++++------------ configure/os/CONFIG_SITE.Common.linux-x86 | 6 ++ 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 609f4b67c..5e5b80101 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. @@ -101,77 +101,70 @@ # RTEMS-uC5282 # -# Definitions of CROSS_COMPILER_TARGET_ARCHS in -# configure/os/CONFIG_SITE..Common files will -# override -# +# Which target architectures to cross-compile for. +# Definitions in configure/os/CONFIG_SITE..Common +# may override this setting. CROSS_COMPILER_TARGET_ARCHS= #CROSS_COMPILER_TARGET_ARCHS=vxWorks-ppc32 -# If only a subset of the host architectures perform -# the build for the CROSS_COMPILER_TARGET_ARCHS -# uncomment the following line and specify them. -# +# If only some of your host architectures can compile the +# above CROSS_COMPILER_TARGET_ARCHS specify those host +# architectures here. If the combination is complicated, +# set CROSS_COMPILER_TARGET_ARCHS in the appropriate +# configure/os/CONFIG_SITE..Common files instead. CROSS_COMPILER_HOST_ARCHS= -# Build shared libraries? -# must be either YES or NO -# NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and -# os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override -# -# NOTE WIN32: YES results in a DLL. Valid settings are -# SHARED_LIBRARIES=YES and STATIC_BUILD=NO -# SHARED_LIBRARIES=NO and STATIC_BUILD=YES -# +# Build shared libraries (DLLs on Windows). +# Must be either YES or NO. Definitions in the target-specific +# os/CONFIG.Common. and os/CONFIG_SITE.Common. files may +# override this setting. On Windows only these combinations are valid: +# SHARED_LIBRARIES = YES and STATIC_BUILD = NO +# SHARED_LIBRARIES = NO and STATIC_BUILD = YES SHARED_LIBRARIES=YES -# Build client objects statically ? -# must be either YES or NO -# +# Build client objects statically. +# Must be either YES or NO. STATIC_BUILD=NO -# Should header dependancy files be automatically generated -# for each C/C++ created object file? -# must be either YES or NO +# Generate header dependancy files for each C/C++ object file. +# Must be either YES or NO. HDEPENDS=YES -# Host build optimization -# must be either YES or NO +# Host build optimization. +# Must be either YES or NO. HOST_OPT=YES -# Cross build optimization -# must be either YES or NO +# Cross build optimization. +# Must be either YES or NO. CROSS_OPT=YES -# Generate Verbose Compiler Warnings for Host builds -# must be either YES or NO +# Generate verbose compiler warnings for host builds. +# Must be either YES or NO. HOST_WARN=YES -# Generate Verbose Compiler Warnings for cross compile builds -# must be either YES or NO +# Generate verbose compiler warnings for cross-compiled builds. +# Must be either YES or NO. CROSS_WARN=YES -# Installation directory -# If you don't want to install into $(TOP) dir then -# define INSTALL_LOCATION here +# Installation directory, if you want Base to be installed into a +# different location then uncomment and set this. #INSTALL_LOCATION= -# Use POSIX thread priority scheduling (YES or NO) +# Use POSIX thread priority scheduling (if available). +# Must be either YES or NO USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO -# Site version number, if set will append '-' and this string to the -# EPICS version number string that is reported by many tools +# Site version number, if set will append '-' and this string to the +# EPICS version number string that is reported by many tools. EPICS_SITE_VERSION = -# For GNU compiler, use pipes rather than temporary files for communication -# between the various stages of compilation. +# For GNU compiler, use pipes rather than temporary files for +# communication between the various stages of compilation. +# Must be either YES or NO GCC_PIPE = NO -# Include RPATH when linking executables and libraries. -# must be either YES or NO -LINKER_USE_RPATH=YES - -# For linux-x86 target builds, tune GNU compiler for cpu-type -# (e.g. generic, i386, i486, i586, or i686) -GNU_TUNE_CFLAGS = -mtune=generic +# Set RPATH when linking executables and libraries. +# Must be either YES or NO. If you set this to NO you must also provide a +# way for Base executables to find their shared libraries at build-time. +LINKER_USE_RPATH = YES diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86 index 10c536f0d..42cd32316 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86 +++ b/configure/os/CONFIG_SITE.Common.linux-x86 @@ -46,3 +46,9 @@ COMMANDLINE_LIBRARY = READLINE # This does cost disk space, but not memory as debug symbols are not # loaded into RAM when the binary is loaded. OPT_CFLAGS_YES += -g + + +# Tune GNU compiler output for a specific cpu-type +# (e.g. generic, i386, i486, i586, or i686) +GNU_TUNE_CFLAGS = -mtune=generic +