diff options
author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-08 19:22:38 +0000 |
---|---|---|
committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-08 19:22:38 +0000 |
commit | d593e3008cde3ee410bdf360303456e7951f7d64 (patch) | |
tree | dce879870e60340eada663baa479000434c236a8 /include | |
parent | a25afc18be2d44d406b8430db5304a4d125a6023 (diff) | |
download | ATCD-d593e3008cde3ee410bdf360303456e7951f7d64.tar.gz |
ChangeLogTag: Wed Aug 8 14:06:36 2001 Krishnakumar B <kitty@cs.wustl.edu>
Diffstat (limited to 'include')
-rw-r--r-- | include/makeinclude/platform_osf1_3.2_cxx.GNU (renamed from include/makeinclude/platform_osf1_3.2.GNU) | 22 | ||||
-rw-r--r-- | include/makeinclude/platform_osf1_4.x_cxx.GNU (renamed from include/makeinclude/platform_osf1_4.0.GNU) | 8 | ||||
-rw-r--r-- | include/makeinclude/platform_osf1_4.x_g++.GNU (renamed from include/makeinclude/platform_osf1_4.0_g++.GNU) | 13 | ||||
-rw-r--r-- | include/makeinclude/platform_osf1_4.x_kcc.GNU (renamed from include/makeinclude/platform_osf1_4.0_kcc.GNU) | 25 | ||||
-rw-r--r-- | include/makeinclude/platform_osf1_4.x_rcc.GNU (renamed from include/makeinclude/platform_osf1_4.0_rcc.GNU) | 20 | ||||
-rw-r--r-- | include/makeinclude/platform_tru64_cxx.GNU | 65 | ||||
-rw-r--r-- | include/makeinclude/platform_tru64_g++.GNU | 44 | ||||
-rw-r--r-- | include/makeinclude/platform_tru64_kcc.GNU | 36 | ||||
-rw-r--r-- | include/makeinclude/platform_tru64_post.GNU | 32 | ||||
-rw-r--r-- | include/makeinclude/platform_tru64_pre.GNU | 11 |
10 files changed, 153 insertions, 123 deletions
diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2_cxx.GNU index d2da4954e75..ef52f05bf58 100644 --- a/include/makeinclude/platform_osf1_3.2.GNU +++ b/include/makeinclude/platform_osf1_3.2_cxx.GNU @@ -3,7 +3,27 @@ # This platform macros file is intended to work with Digital UNIX 3.2 # (OSF/1 3.2g) with CXX 5.7 or later. -debug = 1 +ifeq (,$(debug)) + debug = 1 +endif + +# exceptions=1 is the default on this platform. exceptions=0 has not +# been tested. See the bottom of this file for more. Turning off exceptions +# on this platform can cause bad things to happen. + +ifeq (,$(exceptions)) + exceptions = 1 +endif + +# We want to test with rtti=1 + +ifeq (,$(rtti)) + rtti = 1 +endif + +ifeq (,$(threads)) + threads = 1 +endif CC = cxx CXX = $(CC) diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.x_cxx.GNU index a54c87da97a..97d1a2a1d4f 100644 --- a/include/makeinclude/platform_osf1_4.0.GNU +++ b/include/makeinclude/platform_osf1_4.x_cxx.GNU @@ -1,7 +1,7 @@ # $Id$ # This platform macros file is intended to work with -# Digital UNIX 4.0 (OSF/1 4.0), using the cxx compiler.. +# Digital UNIX 4.x (OSF/1 4.x), using the cxx compiler.. # Note that TAO has not been tested with debug=0 on this platform. So # you should be careful when turning off debug. @@ -53,12 +53,10 @@ ifneq ($(CXX_VER),CXX_5) #### It's not necessary on DU 5.0. WARNING_FLAGS += -msg_disable 1016 endif # optimize - - ifndef ACE_DU_VERSION - # In case this file wasn't included by platform_osf1_cxx.GNU: + ifeq (4.,$(findstring 4.,$(shell uname -r))) # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! WARNING_FLAGS += -msg_disable 9 - endif # ACE_DU_VERSION + endif endif # 6.0 or later CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.x_g++.GNU index 44cb2c39ac2..0f3f03b02ae 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.x_g++.GNU @@ -1,14 +1,23 @@ # $Id$ -# This platform macros file is intended to work with Digital UNIX 4.0 -# (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer). +# This platform macros file is intended to work with Digital UNIX 4.x +# (OSF/1 4.x) and GCC in version 2.7.2.1 (or newer). ifeq (,$(debug)) debug = 1 endif + ifeq (,$(exceptions)) exceptions = 1 endif +ifeq (,$(rtti)) + rtti = 1 +endif + +ifeq (,$(threads)) + threads = 1 +endif + ifeq (,$(optimize)) optimize = 1 endif diff --git a/include/makeinclude/platform_osf1_4.0_kcc.GNU b/include/makeinclude/platform_osf1_4.x_kcc.GNU index ec46c27bd73..474ac00e134 100644 --- a/include/makeinclude/platform_osf1_4.0_kcc.GNU +++ b/include/makeinclude/platform_osf1_4.x_kcc.GNU @@ -1,10 +1,27 @@ # $Id$ -# This platform macros file is intended to work with Digital UNIX 4.0 -# (OSF/1 4.0) and KAI C++ 3.3f. +# This platform macros file is intended to work with Digital UNIX 4.x +# (OSF/1 4.x) and KAI C++ 3.3f. -debug = 1 -optimize = 1 +ifeq (,$(debug)) + debug = 1 +endif + +ifeq (,$(exceptions)) + exceptions = 1 +endif + +ifeq (,$(rtti)) + rtti = 1 +endif + +ifeq (,$(threads)) + threads = 1 +endif + +ifeq (,$(optimize)) + optimize = 1 +endif # WARNING_FLAGS += # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! diff --git a/include/makeinclude/platform_osf1_4.0_rcc.GNU b/include/makeinclude/platform_osf1_4.x_rcc.GNU index f188fe2d682..4e54558e56f 100644 --- a/include/makeinclude/platform_osf1_4.0_rcc.GNU +++ b/include/makeinclude/platform_osf1_4.x_rcc.GNU @@ -3,8 +3,24 @@ # This platform macros file is intended to work with Rational C++ (2.4.1) on # Digital UNIX 4.0 (OSF/1 4.0). -debug = 1 -exceptions = 1 +ifeq (,$(debug)) + debug = 1 +endif + +ifeq (,$(exceptions)) + exceptions = 1 +endif +ifeq (,$(rtti)) + rtti = 1 +endif + +ifeq (,$(threads)) + threads = 1 +endif + +ifeq (,$(optimize)) + optimize = 1 +endif CC = rcc CXX = RCC diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU index 139102689cc..a8f08d5a155 100644 --- a/include/makeinclude/platform_tru64_cxx.GNU +++ b/include/makeinclude/platform_tru64_cxx.GNU @@ -3,56 +3,23 @@ # This platform macros file is intended to work with # Digital UNIX using the cxx compiler. -ifndef ACE_DU_VERSION - ACE_DU_VERSION := $(shell uname -r) -endif # ! ACE_DU_VERSION - -ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU - -else # ! 3.x -ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU - - ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) - endif # ! ACE_DU_SUBVERSION - - ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F - else - ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40E - else - ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40D - else - CFLAGS += -DDIGITAL_UNIX=0x400 - endif - endif - endif - - ifneq ($(CXX_VER),CXX_5) - # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! - WARNING_FLAGS += -msg_disable 9 - endif # 6.0 or later - -else # ! 4.x -ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU + - SOFLAGS = -shared -use_ld_input $(ACELIB) +# Include the macro file for osf1_4.x +# +include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_cxx.GNU - ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) - endif # ! ACE_DU_SUBVERSION - ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x510 - else - CFLAGS += -DDIGITAL_UNIX=0x500 - endif +# Flags specific to 5.x +# +ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) + SOFLAGS = -shared -use_ld_input $(ACELIB) +endif # ! 5.x + -endif # 5.x -endif # ! 4.x -endif # ! 3.x +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU index 939f4063470..155d71109f8 100644 --- a/include/makeinclude/platform_tru64_g++.GNU +++ b/include/makeinclude/platform_tru64_g++.GNU @@ -7,40 +7,14 @@ # fact neither compilation nor testing has been done for almost a year. # So it's better to avoid this combination, if possible. -ifndef ACE_DU_VERSION - ACE_DU_VERSION := $(shell uname -r) -endif # ACE_DU_VERSION +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU -ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU +# Include the macro file for osf1_4.x +# +include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_g++.GNU -else # ! 3.x -ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU - - ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) - endif # ! ACE_DU_SUBVERSION - - ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F - else - ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40E - else - ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40D - else - CFLAGS += -DDIGITAL_UNIX=0x400 - endif - endif - endif - -else # ! 4.x -ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU - CFLAGS += -DDIGITAL_UNIX=0x500 -endif # 5.x - -endif # ! 4.x -endif # ! 3.x +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_kcc.GNU b/include/makeinclude/platform_tru64_kcc.GNU index 7276f96f17e..0fe62b9c24d 100644 --- a/include/makeinclude/platform_tru64_kcc.GNU +++ b/include/makeinclude/platform_tru64_kcc.GNU @@ -3,30 +3,23 @@ # This platform macros file is intended to work with # Digital UNIX using the KAI compiler. -ifndef ACE_DU_VERSION - ACE_DU_VERSION := $(shell uname -r) -endif # ACE_DU_VERSION +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU -ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU +# Include the macro file for osf1_4.x +# +include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_kcc.GNU -else # ! 3.x ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_kcc.GNU - - ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v))) - CFLAGS += -DDIGITAL_UNIX=0x40F + ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) # variable "" was declared but never referenced. # Get these from PTHREAD_THIS_CATCH_NP. WARNING_FLAGS += --diag_suppress 177 - else # ! 4.0F - CFLAGS += -DDIGITAL_UNIX=0x400 endif # ! 4.0F else # ! 4.x ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) - include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_kcc.GNU - # variable "" was declared but never referenced. # Get these from PTHREAD_THIS_CATCH_NP. WARNING_FLAGS += --diag_suppress 177 @@ -34,16 +27,9 @@ ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) # KCC makes a lot of these warnings from the C compiler. WARNING_FLAGS += --backend -msg_disable --backend nonstandcast,missingreturn,uninit1,ptrmismatch - ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) - endif # ! ACE_DU_SUBVERSION - - ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x510 - else - CFLAGS += -DDIGITAL_UNIX=0x500 - endif - endif # 5.x endif # ! 4.x -endif # ! 3.x + +# Include the common macros for all compilers +# +include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_post.GNU b/include/makeinclude/platform_tru64_post.GNU new file mode 100644 index 00000000000..52ccdc93d1a --- /dev/null +++ b/include/makeinclude/platform_tru64_post.GNU @@ -0,0 +1,32 @@ +# $Id$ + +# Common definitions which were in multiple files adding to the confusion + +# All versions of 4.x...Why doesn't Digital have 4.[a-z] ? That would be +# more fun... + +ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) + ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40D + else + ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40E + else + ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40F + else + ifeq (4.0G,$(findstring 4.0G,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x40F # can't have 0x40G + else + CFLAGS += -DDIGITAL_UNIX=0x400 + endif + endif + endif + endif +else # ! 4.x + ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION))) + CFLAGS += -DDIGITAL_UNIX=0x510 + else + CFLAGS += -DDIGITAL_UNIX=0x500 + endif +endif # ! 5.x diff --git a/include/makeinclude/platform_tru64_pre.GNU b/include/makeinclude/platform_tru64_pre.GNU new file mode 100644 index 00000000000..318ba855258 --- /dev/null +++ b/include/makeinclude/platform_tru64_pre.GNU @@ -0,0 +1,11 @@ +# $Id$ + +# Common definitions for all versions of Digital Unix. + +ifndef ACE_DU_VERSION + ACE_DU_VERSION := $(shell uname -r) +endif # ! ACE_DU_VERSION + +ifndef ACE_DU_SUBVERSION + ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) +endif # ! ACE_DU_SUBVERSION |