From 4cb0d85b34c33d50f718ed926ffd9b72ab4b6334 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 3 Mar 2009 19:54:19 +0000 Subject: [PATCH] Removed all references to CONFORM flags in configure files. --- configure/CONFIG | 2 -- configure/CONFIG.gnuCommon | 5 ---- configure/CONFIG_COMMON | 13 +++------ configure/CONFIG_SITE | 13 --------- configure/os/CONFIG.Common.RTEMS | 12 +++------ configure/os/CONFIG.Common.solaris-x86_64-gnu | 15 +++++++++++ configure/os/CONFIG.cygwin-x86.cygwin-x86 | 9 ------- configure/os/CONFIG.darwinCommon.darwinCommon | 5 ---- configure/os/CONFIG.hpux-parisc.hpux-parisc | 10 ------- ...CONFIG.linux-x86-borland.linux-x86-borland | 26 ------------------ .../os/CONFIG.osf-alpha-gnu.osf-alpha-gnu | 5 ---- configure/os/CONFIG.osf-alpha.osf-alpha | 5 ---- configure/os/CONFIG.solaris-x86_64-gnu.Common | 12 +++++++++ ...NFIG.solaris-x86_64-gnu.solaris-x86_64-gnu | 12 +++++++++ .../os/CONFIG.solarisCommon.solarisCommon | 5 ---- ...CONFIG.win32-x86-borland.win32-x86-borland | 27 ------------------- .../CONFIG.win32-x86-cygwin.win32-x86-cygwin | 9 ------- .../os/CONFIG.win32-x86-mingw.win32-x86-mingw | 6 ----- configure/os/CONFIG.win32-x86.win32-x86 | 10 +++---- .../os/CONFIG_SITE.Common.solaris-x86-gnu | 12 +++++++++ .../os/CONFIG_SITE.Common.solaris-x86_64-gnu | 11 ++++++++ 21 files changed, 73 insertions(+), 151 deletions(-) create mode 100644 configure/os/CONFIG.Common.solaris-x86_64-gnu create mode 100644 configure/os/CONFIG.solaris-x86_64-gnu.Common create mode 100644 configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu create mode 100644 configure/os/CONFIG_SITE.Common.solaris-x86-gnu create mode 100644 configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu diff --git a/configure/CONFIG b/configure/CONFIG index 2b60482ed..82264f4c6 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -130,6 +130,4 @@ endif #etc. #CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040 -#CMPLR=STRICT -#CXXCMPLR=STRICT diff --git a/configure/CONFIG.gnuCommon b/configure/CONFIG.gnuCommon index 4207a3064..95bdda1b1 100644 --- a/configure/CONFIG.gnuCommon +++ b/configure/CONFIG.gnuCommon @@ -22,9 +22,6 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r CPP = $(CC) -x c -E RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX) -CONFORM_CFLAGS_ANSI = -ansi -CONFORM_CFLAGS_STRICT = -ansi -CONFORM_CFLAGS_TRAD = -traditional PROF_CFLAGS_YES = -p GPROF_CFLAGS_YES = -pg CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF)) @@ -33,8 +30,6 @@ WARN_CFLAGS_NO = -w OPT_CFLAGS_YES = -O3 OPT_CFLAGS_NO = -g -CONFORM_CXXFLAGS_NORMAL = -ansi -CONFORM_CXXFLAGS_STRICT = -ansi PROF_CXXFLAGS_YES = -p GPROF_CXXFLAGS_YES = -pg CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index c03d1ccd8..62112bf42 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -101,8 +101,6 @@ BUILD_CLASS = HOST #------------------------------------------------------- # Build defaults, CONFIG_SITE, CONFIG, or os/CONFIG* will override -CMPLR=STRICT -CXXCMPLR=STRICT STATIC_BUILD=NO SHARED_LIBRARIES=YES HDEPENDS=YES @@ -225,11 +223,6 @@ TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFL TARGET_LDFLAGS = $($*_LDFLAGS) -# Level of ansi conformance flags -CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR)) -CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR)) -CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CXXCMPLR)) - # Warnings flags WARN_CPPFLAGS = $(WARN_CPPFLAGS_$($(BUILD_CLASS)_WARN)) WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN)) @@ -269,11 +262,11 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY)) INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\ $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES) -CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\ +CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\ $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS) -CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\ +CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\ $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS)\ $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS) @@ -284,7 +277,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \ LDLIBS = $(STATIC_LDLIBS)\ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU)) -CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\ +CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\ $(OPT_CPPFLAGS) $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS)\ $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\ $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 6b4116b81..e1fe3007b 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -104,19 +104,6 @@ CROSS_COMPILER_TARGET_ARCHS= # CROSS_COMPILER_HOST_ARCHS= -# Default ANSI level, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# TRAD - Standard C - Not appropriate here. -CMPLR=STRICT - -# Default C++ compiler ANSI level -# STRICT - ANSI C++ force strict warning flags -# NORMAL - ANSI C++ optional warning flags -# Individual Makefiles may override -CXXCMPLR=STRICT - # Build shared libraries? # must be either YES or NO # NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index c9a240488..cf4518230 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -47,11 +47,11 @@ VALID_BUILDS = Ioc #-------------------------------------------------- # The RTEMS Makefiles redefine several macros, so we have to go # through the following contortions to get the EPICS flags back. -CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\ +CFLAGS = $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\ $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS) -CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\ +CXXFLAGS = $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\ $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\ $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\ $(LIBRARY_SRC_CFLAGS) @@ -63,7 +63,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \ LDLIBS = $(STATIC_LDLIBS)\ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) -CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\ +CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\ $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\ $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) @@ -98,12 +98,6 @@ SHARED_LIBRARIES=NO CODE_CFLAGS = CODE_CXXFLAGS = -#-------------------------------------------------- -# RTEMS uses the inline keyword so -pedantic causes too many problems. -# Using -ansi turns off lots of useful prototypes (e.g. strtok_r). -CONFORM_CFLAGS_STRICT = -CONFORM_CXXFLAGS_STRICT = - #-------------------------------------------------- # Override the usual RTEMS verbosity from ar ARFLAGS = rc diff --git a/configure/os/CONFIG.Common.solaris-x86_64-gnu b/configure/os/CONFIG.Common.solaris-x86_64-gnu new file mode 100644 index 000000000..67c037421 --- /dev/null +++ b/configure/os/CONFIG.Common.solaris-x86_64-gnu @@ -0,0 +1,15 @@ +# CONFIG.Common.solaris-x86_64-gnu +# +# $Id$ +# This file is maintained by the build community. +# +# Definitions for solaris-x86_64 gnu compiler target archs +# Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64-gnu +#------------------------------------------------------- + +# Include definitions common to all solaris-x86-gnu target archs +include $(CONFIG)/os/CONFIG.Common.solaris-x86-gnu + +ARCH_DEP_CFLAGS += -m64 +ARCH_DEP_LDFLAGS += -m64 +#ARCH_DEP_LDFLAGS += -L$(GNU_LIB)/amd64 -R$(GNU_LIB)/amd64 diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86 b/configure/os/CONFIG.cygwin-x86.cygwin-x86 index 8cf0915e9..c6c85c0fd 100644 --- a/configure/os/CONFIG.cygwin-x86.cygwin-x86 +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86 @@ -23,15 +23,6 @@ SHRLIB_CFLAGS = SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -ansi -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = -ansi - -# -ansi build errors need fixing: u_long undeclared, fd_set with no type -CONFORM_CFLAGS_STRICT = -CONFORM_CXXFLAGS_STRICT = - # Override linking with gcc library from CONFIG.gnuCommon GNU_LDLIBS_YES = diff --git a/configure/os/CONFIG.darwinCommon.darwinCommon b/configure/os/CONFIG.darwinCommon.darwinCommon index 57c3ff0c4..a47d5c21a 100644 --- a/configure/os/CONFIG.darwinCommon.darwinCommon +++ b/configure/os/CONFIG.darwinCommon.darwinCommon @@ -94,8 +94,3 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS) %.o: %.m $(COMPILE.c) -c $< -# -# Pedantic produces way too many unnecessary messages -# -CONFORM_CFLAGS_STRICT=-ansi -CONFORM_CXXFLAGS_STRICT=-ansi diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc index 6ff666b3c..e896e2b87 100644 --- a/configure/os/CONFIG.hpux-parisc.hpux-parisc +++ b/configure/os/CONFIG.hpux-parisc.hpux-parisc @@ -14,11 +14,6 @@ RANLIB = AR = ar -rc LD = ld -r -# Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -Aa -mt -CONFORM_CFLAGS_STRICT = -Aa -mt -CONFORM_CFLAGS_TRAD = -Ac -mt - # Portability across different PA-RISC architecture versions CODE_CFLAGS = +DAportable +z WARN_CFLAGS_YES = @@ -31,11 +26,6 @@ CXXCMPLR=STRICT # Selective filter for getting rid of bogus compiler warnings COMPILE_FILTER.cpp = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl -# Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -AA -Aa -mt -CONFORM_CXXFLAGS_STRICT = -AA -Aa -mt -#CONFORM_CXXFLAGS_STRICT += +p - # Portability across different PA-RISC architecture versions CODE_CXXFLAGS = +DAportable +z WARN_CXXFLAGS_YES = +w diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland index f8c5b28fb..0e95da351 100644 --- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland +++ b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland @@ -34,22 +34,6 @@ CC = $(BORLAND_BIN)/bc++ $(CCLINKOPT) LD = $(BORLAND_BIN)/bc++ -r RANLIB = -# -# __STDC__=0 works but not as cleanly as with -# Microsoft Visual C++. -# The Borland header files use ifdef __STDC__ -# to disable many nice things. This is overridden -# by defining NO_BORLAND_STDC in the Makefile. -# -ifdef NO_BORLAND_STDC -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -else -CONFORM_CFLAGS_ANSI = -D__STDC__=0 -CONFORM_CFLAGS_STRICT = -D__STDC__=0 -endif -CONFORM_CFLAGS_TRAD = - # -w display warnings on # -g0 no limit to warning messages # some warning message here are always disabled because they are @@ -77,17 +61,7 @@ CPP = $(BORLAND_BIN)/bcpp # Configure OS vendor C++ compiler # -# __STDC__=0 works but not as cleanly as with -# Microsoft Visual C++. -# The Borland header files use ifdef __STDC__ -# to disable many nice things. This is overridden -# by defining NO_BORLAND_STDC in the Makefile. -# CCC = $(BORLAND_BIN)/bc++ $(CCLINKOPT) -ifndef NO_BORLAND_STDC -CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0 -CONFORM_CXXFLAGS_STRICT = -D__STDC__=0 -endif # -w display warnings on # -g0 no limit to warning messages diff --git a/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu b/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu index 2fd7c5434..471b5288a 100644 --- a/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu +++ b/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu @@ -15,9 +15,6 @@ AR = ar -r LD = -r # Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -CONFORM_CFLAGS_TRAD = CODE_CFLAGS = WARN_CFLAGS_YES = WARN_CFLAGS_NO = -w @@ -25,8 +22,6 @@ OPT_CFLAGS_YES = -O OPT_CFLAGS_NO = -g # Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = PROF_CXXFLAGS_YES = +p PROF_CXXFLAGS_NO = CODE_CXXFLAGS = diff --git a/configure/os/CONFIG.osf-alpha.osf-alpha b/configure/os/CONFIG.osf-alpha.osf-alpha index 4138aa8de..1e9fcfc02 100644 --- a/configure/os/CONFIG.osf-alpha.osf-alpha +++ b/configure/os/CONFIG.osf-alpha.osf-alpha @@ -15,9 +15,6 @@ AR = ar -r LD = -r # Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -std -CONFORM_CFLAGS_STRICT = -std1 -CONFORM_CFLAGS_TRAD = -std0 CODE_CFLAGS = WARN_CFLAGS_YES = WARN_CFLAGS_NO = -w @@ -25,8 +22,6 @@ OPT_CFLAGS_YES = -O OPT_CFLAGS_NO = -g # Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = -std gnu PROF_CXXFLAGS_YES = +p PROF_CXXFLAGS_NO = CODE_CXXFLAGS = diff --git a/configure/os/CONFIG.solaris-x86_64-gnu.Common b/configure/os/CONFIG.solaris-x86_64-gnu.Common new file mode 100644 index 000000000..5c30a1c1c --- /dev/null +++ b/configure/os/CONFIG.solaris-x86_64-gnu.Common @@ -0,0 +1,12 @@ +# CONFIG.solaris-x86_64-gnu.Common +# +# $Id$ +# This file is maintained by the build community. +# +# Definitions for solaris-x86_64 gnu compiler host builds +# Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.Common +#------------------------------------------------------- + +#Include definitions common to solaris-x86-gnu hosts +include $(CONFIG)/os/CONFIG.solaris-x86-gnu.Common + diff --git a/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu b/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu new file mode 100644 index 000000000..aa701940e --- /dev/null +++ b/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu @@ -0,0 +1,12 @@ +# CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu +# +# $Id$ +# This file is maintained by the build community. +# +# Definitions for solaris-x86_64 gnu compiler host - solaris-sx86_64 gnu compiler target builds +# Sites may override these definitions in CONFIG_SITE.solaris-x86_64-gnu.solaris-x86_64-gnu +#------------------------------------------------------- + +# Include common solaris-x86-gnu definitions +include $(CONFIG)/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu + diff --git a/configure/os/CONFIG.solarisCommon.solarisCommon b/configure/os/CONFIG.solarisCommon.solarisCommon index 6a7d89def..b3efddd15 100644 --- a/configure/os/CONFIG.solarisCommon.solarisCommon +++ b/configure/os/CONFIG.solarisCommon.solarisCommon @@ -23,9 +23,6 @@ PROFILE=NO GPROF=NO # Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -Xa -v -CONFORM_CFLAGS_STRICT = -Xa -v -CONFORM_CFLAGS_TRAD = -Xs PROF_CFLAGS_YES = -p GPROF_CFLAGS_YES = -xpg CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF)) @@ -35,8 +32,6 @@ OPT_CFLAGS_YES = -xO4 OPT_CFLAGS_NO = -g # Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = PROF_CXXFLAGS_YES = -p GPROF_CXXFLAGS_YES = -xpg CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index c63949adf..f5bf7b965 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -43,22 +43,6 @@ CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) LD = $(BORLAND_BIN)/bcc32 -r RANLIB = -# -# __STDC__=0 works but not as cleanly as with -# Microsoft Visual C++. -# The Borland header files use ifdef __STDC__ -# to disable many nice things. This is overridden -# by defining NO_BORLAND_STDC in the Makefile. -# -ifdef NO_BORLAND_STDC -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -else -CONFORM_CFLAGS_ANSI = -D__STDC__=0 -CONFORM_CFLAGS_STRICT = -D__STDC__=0 -endif -CONFORM_CFLAGS_TRAD = - # -w display warnings on # -g0 no limit to warning messages # some warning message here are always disabled because they are @@ -87,18 +71,7 @@ CPP = $(BORLAND_BIN)/cpp32 -Sr PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $< # Configure OS vendor C++ compiler -# -# __STDC__=0 works but not as cleanly as with -# Microsoft Visual C++. -# The Borland header files use ifdef __STDC__ -# to disable many nice things. This is overridden -# by defining NO_BORLAND_STDC in the Makefile. -# CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) -ifndef NO_BORLAND_STDC -CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0 -CONFORM_CXXFLAGS_STRICT = -D__STDC__=0 -endif # -w display warnings on # -g0 no limit to warning messages diff --git a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin index b27589ac4..9964fdd28 100644 --- a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin +++ b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin @@ -23,15 +23,6 @@ SHRLIB_CFLAGS = SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -ansi -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = -ansi - -# -ansi build errors need fixing: u_long undeclared, fd_set with no type -CONFORM_CFLAGS_STRICT = -CONFORM_CXXFLAGS_STRICT = - # Override linking with gcc library from CONFIG.gnuCommon GNU_LDLIBS_YES = diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw index f64992142..bd840d99d 100644 --- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw +++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw @@ -23,12 +23,6 @@ SHRLIB_CFLAGS = SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) -# Dont use -ansi option: eliminates _fdopen, _tempnam, ... -CONFORM_CFLAGS_ANSI = -CONFORM_CFLAGS_STRICT = -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = - # Override linking with gcc library from CONFIG.gnuCommon GNU_LDLIBS_YES = diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index bc1cfaef2..ce22f60f6 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -39,9 +39,9 @@ CC = cl # # Use of /Za would dissable DLL import/export keywords which # include/excludes using architecture neutral macros -CONFORM_CFLAGS_ANSI = /nologo /D__STDC__=0 -CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0 -CONFORM_CFLAGS_TRAD = /nologo +##CONFORM_CFLAGS_ANSI = /nologo /D__STDC__=0 +##CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0 +##CONFORM_CFLAGS_TRAD = /nologo # # /W use warning level N @@ -107,8 +107,8 @@ CPP = cl /C /E # /GR - generate code for run time type identification # CCC = cl /nologo /EHsc /GR -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = /D__STDC__=0 +#CONFORM_CXXFLAGS_NORMAL = +#CONFORM_CXXFLAGS_STRICT = /D__STDC__=0 CODE_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86-gnu b/configure/os/CONFIG_SITE.Common.solaris-x86-gnu new file mode 100644 index 000000000..ff3500856 --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.solaris-x86-gnu @@ -0,0 +1,12 @@ +# CONFIG_SITE.Common.solaris-x86-gnu +# +# $Id$ +# +# Site Specific definitions for solaris-x86-gnu target +# Only the local epics system manager should modify this file + +# solaris 10 default location +#GNU_DIR=/usr/sfw + +# APS site override +GNU_DIR = /usr/local diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu b/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu new file mode 100644 index 000000000..75e73ab5c --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu @@ -0,0 +1,11 @@ +# CONFIG_SITE.Common.solaris-x86_64-gnu +# +# $Id$ +# +# Site Specific definitions for solaris-x86_64-gnu target +# Only the local epics system manager should modify this file + +# Include definitions common to all solaris-sparc-gnu target archs +include $(CONFIG)/os/CONFIG_SITE.Common.solaris-x86-gnu + +COMMANDLINE_LIBRARY = EPICS