From 339d46f0be8c3fea05f0081a982ba884cfe3bb31 Mon Sep 17 00:00:00 2001 From: Simon McQueen Date: Tue, 11 Apr 2006 13:22:47 +0000 Subject: ChangeLogTag: Tue Apr 11 13:12:36 UTC 2006 Simon McQueen --- ChangeLog | 14 ++++++++++ ace/Lib_Find.h | 1 + ace/config-macros.h | 2 +- include/makeinclude/platform_hpux_aCC.GNU | 44 +++++++++++++++++-------------- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 740f0181138..a1dd6e37150 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Tue Apr 11 13:12:36 UTC 2006 Simon McQueen + + * ace/Lib_Find.h: + + aCC 3.31 seems to want an extra newline at the end of this file. + + * ace/config-macros.h: + + ACE_NOTREACHED is reached for aCC up to 3.31 at least. + + * include/makeinclude/platform_hpux_aCC.GNU: + + Define ACE_LACKS_MEMBER_TEMPLATES for aCC 3.31 because it does. + Tue Apr 11 12:41:00 2006 Johnny Willemsen * bin/MakeProjectCreator/config/ciao_config_handlers.mpb: diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h index aee1fa72aee..418de3751de 100644 --- a/ace/Lib_Find.h +++ b/ace/Lib_Find.h @@ -105,3 +105,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LIB_FIND_H */ + diff --git a/ace/config-macros.h b/ace/config-macros.h index 76cebb7c105..9a8c22aa90a 100644 --- a/ace/config-macros.h +++ b/ace/config-macros.h @@ -401,7 +401,7 @@ # define ACE_UNUSED_ARG(a) (a) #endif /* ghs || __GNUC__ || ..... */ -#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || defined (__HP_aCC) +#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC >= 33200)) # define ACE_NOTREACHED(a) #else /* __sgi || ghs || ..... */ # define ACE_NOTREACHED(a) a diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index eebdde865bd..3309743947f 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -26,10 +26,10 @@ versioned_so ?= 0 # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) +HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) # -CC = /bin/cc -CXX = aCC +CC = /bin/cc +CXX = aCC # Determine compiler version CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) @@ -57,6 +57,10 @@ ifeq (1,$(stdcpplib)) # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP # as support call 3201224717. (Steve Huston, 23-Nov-2002) CCFLAGS += +W930 + # aCC 3.31 has poor member template support. + ifeq (31,$(CXXMINORVERS)) + CCFLAGS += -DACE_LACKS_MEMBER_TEMPLATES + endif endif # Compile errors using -AA and +noeh together - HP problem report # JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. @@ -138,35 +142,35 @@ endif ifeq ($(word 2,$(HPVERS_WORDS)), 10) CCFLAGS += +W495,667,829,908 endif -DCCFLAGS += -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = -O -PIC = +Z +DCCFLAGS += -g +DLD = $(CXX) $(CCFLAGS) +LD = $(CXX) +OCCFLAGS = -O +PIC = +Z PRELIB = $(COMPILE.cc) $^ AR = /usr/ccs/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -Wl,+s -z -SOFLAGS += -b +ARFLAGS = ruv +RANLIB = echo +LDFLAGS = -Wl,+s -z +SOFLAGS += -b ifeq ($(distrib),1) ifeq ($(word 2,$(HPVERS_WORDS)), 10) -SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F) +SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F) else ifeq ($(buildbits),32) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib +SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib endif ifeq ($(buildbits),64) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 +SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 endif endif endif -SOEXT = sl +SOEXT = sl ifeq ($(buildbits),32) ifeq ($(itanium),1) @@ -186,7 +190,7 @@ ifeq ($(buildbits),64) CCFLAGS += +DA2.0 +DS2.0 endif endif -LDFLAGS += -Wl,+vnocompatwarnings +LDFLAGS += -Wl,+vnocompatwarnings else ifneq ($(itanium),1) # HP aCC on Itanium doesn't support this option, defaults to 32bit then. @@ -210,14 +214,14 @@ ifeq ($(word 2,$(HPVERS_WORDS)), 11) LIBS += -L./ -lpthread endif endif - LIBS += -lxti -lrt -ldld + LIBS += -lxti -lrt -ldld else # 10.x: - LIBS += -lxti -ldld + LIBS += -lxti -ldld ifeq ($(threads),1) - LIBS += -lcma + LIBS += -lcma endif endif -- cgit v1.2.1