diff options
27 files changed, 81 insertions, 28 deletions
diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU index 41162b868a1..56ba8b19046 100644 --- a/include/makeinclude/platform_aix.GNU +++ b/include/makeinclude/platform_aix.GNU @@ -28,7 +28,9 @@ ARFLAGS = ruv AR = ar LDFLAGS += -bI:/lib/pse.exp # Should be set to optimize for your particular computer. This -# is set to be optimized for RS/6000 43P +# is set to be optimized for RS/6000 43P. +# OCCFLAGS is not used by default. To used it, set optimize=1 +# either in this file or on the command line. OCCFLAGS += -qarch=ppc -qtune=604 RANLIB = ranlib SOFLAGS = -p 0 diff --git a/include/makeinclude/platform_aix4.2.GNU b/include/makeinclude/platform_aix4.2.GNU index 96becb065ac..7d852c5d7db 100644 --- a/include/makeinclude/platform_aix4.2.GNU +++ b/include/makeinclude/platform_aix4.2.GNU @@ -27,7 +27,9 @@ AR = ar LDFLAGS += -bI:/lib/pse.exp # Default OCCFLAGS builds common code for all RS/6000 architectures but # this can be set to optimize for your particular computer. The commented -# out example optimizes for RS/6000 43P +# out example optimizes for RS/6000 43P. +# OCCFLAGS is not used by default. To used it, set optimize=1 +# either in this file or on the command line. #OCCFLAGS += -qarch=ppc -qtune=604 OCCFLAGS += -qarch=com RANLIB = ranlib diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU index 65af9a57eb0..039a7d3e2a0 100644 --- a/include/makeinclude/platform_chorus.GNU +++ b/include/makeinclude/platform_chorus.GNU @@ -3,6 +3,7 @@ # Chorus 3.1b with GNU g++ 2.7.2 debug = 1 +optimize = 1 include $(CLASSIXDIR)/dtool/htgt-cf.rf INC_DIR = $(CLASSIXDIR)/include @@ -11,7 +12,7 @@ LIB_DIR = $(CLASSIXDIR)/lib #CC = gcc #CXX = g++ CXX = $(CC) -CFLAGS += -w -O2 +CFLAGS += -w CCFLAGS += $(CFLAGS) -fno-implicit-templates \ -fno-strict-prototypes \ -nostdinc \ @@ -29,6 +30,7 @@ LDFLAGS += -r -Ur -nostdlib \ -L$(LIB_DIR)/CC \ -L$(LIB_DIR)/classix #LIBS += -lC -lcx.u +OCFLAGS += -O2 PIC = -fPIC #AR = ar AR = $(XDIR)/bin/ar diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU index ea79a5ba9b8..90ee7e6ba19 100644 --- a/include/makeinclude/platform_freebsd.GNU +++ b/include/makeinclude/platform_freebsd.GNU @@ -6,15 +6,17 @@ # To be used on FreeBSD platform without pthread support. debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes +CFLAGS += -w -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = ld LD = $(CXX) LIBS += -lstdc++ -lcompat +OCFLAGS += -O2 PIC = -fpic -DPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_freebsd_pthread.GNU b/include/makeinclude/platform_freebsd_pthread.GNU index 893ead3edad..947d47924e8 100644 --- a/include/makeinclude/platform_freebsd_pthread.GNU +++ b/include/makeinclude/platform_freebsd_pthread.GNU @@ -3,6 +3,7 @@ # platform_freebsd_pthread.GNU # ***** Notice: This configuration is still under debugging. ***** +optimize = 1 # ***** It still doesn't work quite the way it expected to. ***** # For pthreads support on FreeBSD, you need @@ -17,12 +18,13 @@ debug = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes -D_POSIX_THREADS +CFLAGS += -w -fno-strict-prototypes -D_POSIX_THREADS CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = ld LD = $(CXX) LIBS += -lc_r -lstdc++ -lcompat +OCFLAGS += -O2 PIC = -fpic -DPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU index 5a395c8341a..4c184ecbed3 100644 --- a/include/makeinclude/platform_hpux_gcc.GNU +++ b/include/makeinclude/platform_hpux_gcc.GNU @@ -2,6 +2,7 @@ # debug = 1 +optimize = 1 # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) @@ -9,11 +10,12 @@ HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) # CC = gcc CXX = g++ -CFLAGS += -w -O2 +CFLAGS += -w CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g -DHPUX_VERS=$(HPUX_VERS) DLD = $(CXX) LD = $(CXX) +OCFLAGS += -O2 PIC = -fPIC ARFLAGS = ruv RANLIB = echo diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU index d5668ee6c22..57a80d16440 100644 --- a/include/makeinclude/platform_irix5.2.GNU +++ b/include/makeinclude/platform_irix5.2.GNU @@ -3,16 +3,18 @@ # Irix 5.2 with gcc 2.6.1 debug = 1 +optimize = 1 MAKE = gmake CC = gcc CXX = g++ -CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates +CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += LIBS += -ldl +OCFLAGS += -O2 PIC = -fpic RANLIB = echo SOFLAGS = diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU index 22f49da78b4..2353ab4170d 100644 --- a/include/makeinclude/platform_irix5.3_g++.GNU +++ b/include/makeinclude/platform_irix5.3_g++.GNU @@ -3,14 +3,16 @@ # Irix 5.3 with GNU C++ debug = 1 +optimize = 1 CC = gcc CXX = g++ -CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates +CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(ACE_ROOT)/ace +OCFLAGS += -O2 PIC = -fpic RANLIB = echo SOFLAGS = -shared $(CPPFLAGS) diff --git a/include/makeinclude/platform_irix6.x-32_sgic++.GNU b/include/makeinclude/platform_irix6.x-32_sgic++.GNU index e87d0cafcfe..3e9bf25f09b 100644 --- a/include/makeinclude/platform_irix6.x-32_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-32_sgic++.GNU @@ -3,6 +3,7 @@ # Irix 6.[234] with SGI C++ in -32 (aka -o32) mode debug = 1 +optimize = 1 # Note that -32 mode doesn't have exceptions enabled by default, and # that the man-page cautions against it's use (you may not be able to @@ -23,7 +24,7 @@ LD = $(CXX) # Basic flags CPPFLAGS += -D_SGI_MP_SOURCE -CCFLAGS += -O +OCCFLAGS += -O CCFLAGS += +pp -woff 3203,3209,3161,3262,3665,3937,3259,3920 # Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might # not build due to missing template instantiations. diff --git a/include/makeinclude/platform_irix6.x-n32_sgic++.GNU b/include/makeinclude/platform_irix6.x-n32_sgic++.GNU index d0356c6fc82..e41993915d9 100644 --- a/include/makeinclude/platform_irix6.x-n32_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-n32_sgic++.GNU @@ -3,6 +3,7 @@ # Irix 6.[234] with SGI C++ in -n32 mode debug = 1 +optimize = 1 # This suppresses common compiler warnings which appear in the # ACE code but should not matter. The warnings can be turned on @@ -15,7 +16,7 @@ LD = $(CXX) # Basic flags CPPFLAGS += -D_SGI_MP_SOURCE -CCFLAGS += -O +OCCFLAGS += -O CCFLAGS += -woff 1188,1682,1171,1681,1110 # Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might # not build due to missing template instantiations. diff --git a/include/makeinclude/platform_irix6.x-sgic++.GNU b/include/makeinclude/platform_irix6.x-sgic++.GNU index f4f5d4c798e..4ad5f368a0e 100644 --- a/include/makeinclude/platform_irix6.x-sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-sgic++.GNU @@ -3,6 +3,7 @@ # Irix 6.[234] with SGI C++ debug = 1 +optimize = 1 # Instead of setting the ABI here we rely on the the macro SGI_ABI. CC = cc @@ -14,7 +15,7 @@ LD = $(CXX) # In Irix 6.2 w/o the thread patches this macro should have no effect. CPPFLAGS += -D_SGI_MP_SOURCE -CCFLAGS += -O +OCCFLAGS += -O # Enable exceptions even in the o32 bit ABI. CCFLAGS += -exceptions diff --git a/include/makeinclude/platform_irix6.x_g++.GNU b/include/makeinclude/platform_irix6.x_g++.GNU index 066a7938059..409ad04c776 100644 --- a/include/makeinclude/platform_irix6.x_g++.GNU +++ b/include/makeinclude/platform_irix6.x_g++.GNU @@ -3,15 +3,17 @@ # Irix 6.2 with GNU C++ debug = 1 +optimize = 1 CC = gcc CXX = g++ CFLAGS += $(DCFLAGS) -CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates +CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(ACE_ROOT)/ace -Wl,-dont_warn_unused +OCFLAGS += -O2 PIC = -fpic # AR = ar ARFLAGS = rv diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index fc2216f0e2e..dbbd89aa83f 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -4,15 +4,17 @@ # should allow ACE to be built on Linux. debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes +CFLAGS += -w -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl +OCFLAGS += -O2 PIC = -fPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 53f71abccd9..1dc6db8ed61 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -9,15 +9,17 @@ # Jan Rychter <jwr@icm.edu.pl> debug = 1 +optimize = 1 CC = gcc CXX = g++ CFLAGS += -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates -DCFLAGS += -g -O3 +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread +OCFLAGS += -O3 PIC = -fPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 53f71abccd9..1dc6db8ed61 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -9,15 +9,17 @@ # Jan Rychter <jwr@icm.edu.pl> debug = 1 +optimize = 1 CC = gcc CXX = g++ CFLAGS += -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates -DCFLAGS += -g -O3 +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread +OCFLAGS += -O3 PIC = -fPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index 8939d2a246f..52d8045787f 100644 --- a/include/makeinclude/platform_linux_pthread.GNU +++ b/include/makeinclude/platform_linux_pthread.GNU @@ -10,15 +10,17 @@ # Jan Rychter <jwr@icm.edu.pl> debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CFLAGS += -w -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -lpthreads +OCFLAGS += -O2 PIC = -fPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU index 1b9e5b4bd6c..7c0953501a7 100644 --- a/include/makeinclude/platform_lynxos.GNU +++ b/include/makeinclude/platform_lynxos.GNU @@ -6,12 +6,13 @@ static_libs_only = 1 CC = gcc CXX = g++ -CFLAGS += -mthreads -pipe #### -Wall -Wpointer-arith -Winline -O2 +CFLAGS += -mthreads -pipe #### -Wall -Wpointer-arith -Winline CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototype DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -lsocket -ldl -lgen -lnsl -lthread -lw +OCFLAGS += -O2 AR = ar ARFLAGS = ruv RANLIB = @true diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index ab8dbd5e93b..382c6e2adc2 100644 --- a/include/makeinclude/platform_m88k.GNU +++ b/include/makeinclude/platform_m88k.GNU @@ -4,10 +4,11 @@ # *not* using Orbix debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 +CFLAGS += -w CCFLAGS += $(CFLAGS) -D__m88k__ -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g DLD = $(CXX) @@ -18,6 +19,7 @@ LDFLAGS += -L $(ACE_ROOT)/ace -L ./ LDFLAGS += -L/devel/rmm/v1.0/local/src/threads/lib LIBS += -lsocket -ldl -lnsl -lgen -lstdc++ -lg++ LIBS += -lgthreads -lgmalloc +OCFLAGS += -O2 PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU index d9b4363e475..663f754ac61 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.0_g++.GNU @@ -4,15 +4,17 @@ # (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer). debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -D_REENTRANT -O2 +CFLAGS += -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g LD = $(CXX) DLD = $(CXX) LIBS += -lpthread -lmach -lexc -ltli -lrt +OCFLAGS += -O2 PIC = -fpic ARFLAGS = ruvZ # When libraries are archived, a hash index is automatically created so there diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index 59cd955679c..efbdad9bd02 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -1,15 +1,17 @@ # $Id$ debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -w -O2 +CFLAGS += -w CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g #### should this be -gstabs? DLD = $(CXX) LD = $(CXX) LIBS = -lsocket +OCFLAGS = -O2 PIC = AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU index 7dbb02e4d84..69229afab1e 100644 --- a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU +++ b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU @@ -5,6 +5,7 @@ # for not link -lc and -lgcc and other not shared libraries debug = 1 +optimize = 1 CC = gcc # for threads @@ -14,13 +15,15 @@ CC = gcc # LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o -lACE # -z muldefs LDLIBS += -L $(ACE_ROOT)/ace # -z muldefs CXX = g++ -CFLAGS += -b elf -w -O2 -CCFLAGS += -b elf -O2 -fpic -Xpg4plus -fno-implicit-templates -I ${FSU_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include +CFLAGS += -b elf -w +CCFLAGS += -b elf -fpic -Xpg4plus -fno-implicit-templates -I ${FSU_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include DCFLAGS += -gstabs DCCFLAGS += $(DCFLAGS) DLD = $(CXX) LD = $(CXX) LIBS = -L${FSU_PTHREADS_DIR}/lib -lnsl -lsocket -lgthreads +OCFLAGS += -O2 +OCCFLAGS += $(OCFLAGS) PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU index 180bc005937..a30197aabb5 100644 --- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU +++ b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU @@ -5,6 +5,7 @@ # for not link -lc and -lgcc and other not shared libraries debug = 1 +optimize = 1 CC = gcc # for threads @@ -14,13 +15,15 @@ CC = gcc # LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${MIT_PTHREADS_DIR}/init/init.o -lACE # -z muldefs LDLIBS += -L $(ACE_ROOT)/ace -L ./ -lACE # -z muldefs CXX = g++ -CFLAGS += -b elf -w -O2 -CCFLAGS += -b elf -O2 -fpic -Xpg4plus -fno-implicit-templates -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include +CFLAGS += -b elf -w +CCFLAGS += -b elf -fpic -Xpg4plus -fno-implicit-templates -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include DCFLAGS += -gstabs DCCFLAGS += $(DCFLAGS) DLD = $(CXX) LD = $(CXX) LIBS = -L${MIT_PTHREADS_DIR} -lnsl -lpthread +OCFLAGS += -O2 +OCCFLAGS += $(OCFLAGS) PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU index 2fcf20842d7..8a852efe2f3 100644 --- a/include/makeinclude/platform_sco5.0.0-nothread.GNU +++ b/include/makeinclude/platform_sco5.0.0-nothread.GNU @@ -3,16 +3,18 @@ # SCO v5.0.2; gcc version 2.7-95q4(Skunkware96 distribution from media images) debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -b elf -w -O2 +CFLAGS += -b elf -w CCFLAGS += $(CFLAGS) -Xpg4plus -fno-implicit-templates \ -I/usr/progressive/lib/g++-include DCFLAGS += -gstabs DLD = $(CXX) LD = $(CXX) LIBS += -lsocket -lnsl -ldl +OCFLAGS += -O2 PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index b4927fc3ab9..35c3f8f61b9 100644 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ b/include/makeinclude/platform_sunos4_g++.GNU @@ -3,16 +3,18 @@ # SunOS 4.x (Solaris 1.x) with g++ *not* using Orbix debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -O2 -fno-strict-prototypes +CFLAGS += -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = /bin/ld LD = $(CXX) # # for G++ v2.6.0 +OCFLAGS += -O2 PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index 9a52ef1c1c1..456bc054d26 100644 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ b/include/makeinclude/platform_sunos5_g++.GNU @@ -3,16 +3,18 @@ # SunOS 5.x (Solaris 2.x) with g++ *not* using Orbix debug = 1 +optimize = 1 CC = gcc CXX = g++ -CFLAGS += -Wall -Wpointer-arith -O2 -pipe #### -Winline +CFLAGS += -Wall -Wpointer-arith -pipe #### -Winline CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += # -z muldefs LIBS += -lsocket -ldl -lgen -lnsl -lthread -lw +OCFLAGS += -O2 PIC = -fpic AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 2f5515e78a5..78cd891bebc 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -51,6 +51,7 @@ else LIBS += -lsocket -ldl -lnsl -lgen endif # orbix +OCFLAGS += -O PIC = -PIC AR = CC ARFLAGS = -xar -o diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index 4e9aaa41b1a..de1332731d9 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -10,6 +10,7 @@ #### ace/IOStream_T.cpp for an explanation and example. debug = 1 +optimize = 1 static_libs_only = 1 @@ -48,7 +49,7 @@ BIN_DIR = $(HOST_DIR)/bin CC = cc$(TOOLENV) CXX = g++$(TOOLENV) -CFLAGS += -DVXWORKS -D_REENTRANT -ansi -fno-builtin -fno-defer-pop -fvolatile -nostdinc -nostdlib -O -pipe -Wall +CFLAGS += -DVXWORKS -D_REENTRANT -ansi -fno-builtin -fno-defer-pop -fvolatile -nostdinc -nostdlib -pipe -Wall #### Note: -f-no-implicit-templates doesn't seem to work well with #### g++ cygnus-2.7.2-960126 for pc486 target. Some #### member functions don't get instantiated. Wind River knows @@ -58,6 +59,9 @@ DCFLAGS += -g INCLDIRS += -I$(WIND_BASE)/target/h LD = ld$(TOOLENV) LDFLAGS += -X -r .obj/__ctordtor.o +#### WindRiver only recommends -O, not -O2, with some CPUs, including +#### the i386 family. +OCFLAGS += -O PIC = AR = ar$(TOOLENV) ARFLAGS = rv |