diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-23 17:51:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-23 17:51:25 +0000 |
| commit | 85cba0edb2db9256d6416751eb7441db78b2b3de (patch) | |
| tree | 7534e128ee237c99dc6ee6b187fc8ef55c2f74d6 | |
| parent | 4b6aef26438adabd73d8c9c875d8c332f4d1af2f (diff) | |
| download | ATCD-85cba0edb2db9256d6416751eb7441db78b2b3de.tar.gz | |
ChangeLogTag: Mon Aug 23 17:51:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index 4a1031b8b61..2864f5f76ca 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -97,7 +97,11 @@ else endif endif -# Suppress warning 302 ((...) parameter list is a non-portable feature) +ifeq ($(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))), 1123) + itanium = 1 +endif + +# Suppress Warning 302 ((...) parameter list is a non-portable feature) CCFLAGS += +W302 CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE @@ -126,7 +130,7 @@ AR = /usr/ccs/bin/ar ARFLAGS = ruv RANLIB = echo LDFLAGS = -Wl,+s -z -SOFLAGS += -b +SOFLAGS += -b ifeq ($(distrib),1) @@ -146,18 +150,29 @@ endif SOEXT = sl ifeq ($(buildbits),32) -CCFLAGS += +DA1.1 +DS1.1 + ifeq ($(itanium),1) + CCFLAGS += +DD32 + else + CCFLAGS += +DA1.1 +DS1.1 + endif else ifeq ($(buildbits),64) - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - ## Without the W, it isn't really a 64-bit build - CCFLAGS += +DA2.0W +DS2.0W + ifeq ($(itanium),1) + CCFLAGS += +DD64 else - CCFLAGS += +DA2.0 +DS2.0 + ifeq ($(word 2,$(HPVERS_WORDS)), 11) + ## Without the W, it isn't really a 64-bit build + CCFLAGS += +DA2.0W +DS2.0W + else + CCFLAGS += +DA2.0 +DS2.0 + endif endif LDFLAGS += -Wl,+vnocompatwarnings else -CCFLAGS += +DAportable + ifneq ($(itanium),1) + # HP aCC on Itanium doesn't support this option, defaults to 32bit then. + CCFLAGS += +DAportable + endif endif endif |