diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-01 21:01:36 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-01 21:01:36 +0000 |
| commit | e750e22820b82433b8f564e606d78be8acc8cb8f (patch) | |
| tree | 32d6213983af9e7c12591e1948bb94937ac05ab2 /include/makeinclude | |
| parent | cd91c3cbf6dbbdeef3ecdff6308d8a003ed62e4d (diff) | |
| download | ATCD-e750e22820b82433b8f564e606d78be8acc8cb8f.tar.gz | |
ChangeLogTag: Thu Nov 1 15:49:04 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_osf1_4.x_cxx.GNU | 14 | ||||
| -rw-r--r-- | include/makeinclude/platform_tru64_cxx.GNU | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/include/makeinclude/platform_osf1_4.x_cxx.GNU b/include/makeinclude/platform_osf1_4.x_cxx.GNU index 97d1a2a1d4f..ac568306178 100644 --- a/include/makeinclude/platform_osf1_4.x_cxx.GNU +++ b/include/makeinclude/platform_osf1_4.x_cxx.GNU @@ -30,6 +30,12 @@ endif CC = cxx CXX = $(CC) + +# Note: Just get the version if it hasnt been defined so far. +ifndef CXX_VERSION + CXX_VERSION := $(shell $(CXX) -V) +endif # ! CXX_VERSION + #### Note: -thread uses POSIX threads. If you want to use DCE threads #### instead, change "-pthread" to "-threads". ifeq ($(threads),1) @@ -38,6 +44,8 @@ else CFLAGS += -DACE_MT_SAFE=0 endif + + #### These flags can only be used with cxx Version 6.0 and later. #### They are enabled by default; they can be disabled by settting #### CXX_VER to CXX_5 either on the make command line, or by @@ -84,15 +92,13 @@ ifeq (0,$(rtti)) CCFLAGS += -nortti endif # rtti + ifeq (0,$(exceptions)) #### Disable the default exception handling of cxx >= 6.0. #### This is untested. exceptions=1 is the default, so it's not used #### by default. - ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) -V) - endif # ! CXX_VERSION - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) CCFLAGS += -nocleanup endif # 6.x endif # ! exceptions + diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU index a8f08d5a155..62a95b3dd24 100644 --- a/include/makeinclude/platform_tru64_cxx.GNU +++ b/include/makeinclude/platform_tru64_cxx.GNU @@ -19,6 +19,14 @@ ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) SOFLAGS = -shared -use_ld_input $(ACELIB) endif # ! 5.x +### There is a bug with pthreads header file shipped with v1885 of +### V5.1. We need to turn this flag to get asm () inline for +### compilation. +ifeq (1885,$(findstring 1885,$(ACE_DU_SUBVERSION))) + ifeq (6.,$(findstring 6.,$(CXX_VERSION))) + CPPFLAGS += -D_PTHREAD_ENV_DECCXX + endif # 6.x +endif #v1885 # Include the common macros for all compilers # |