diff options
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_aix_ibm.GNU | 1 | ||||
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_irix6.x_sgic++.GNU | 1 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 14 |
4 files changed, 19 insertions, 3 deletions
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU index c2493199884..d785081274d 100644 --- a/include/makeinclude/platform_aix_ibm.GNU +++ b/include/makeinclude/platform_aix_ibm.GNU @@ -142,6 +142,7 @@ else # Visual Age 5 and up SOFLAGS += $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS) ifeq ($(buildbits),64) DLD += -q64 + CFLAGS += -q64 -qwarn64 CCFLAGS += -q64 -qwarn64 ARFLAGS := -X64 $(ARFLAGS) diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index 3309743947f..08c0deaa13c 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -174,19 +174,24 @@ SOEXT = sl ifeq ($(buildbits),32) ifeq ($(itanium),1) + CFLAGS += +DD32 CCFLAGS += +DD32 else + CFLAGS += +DA1.1 +DS1.1 CCFLAGS += +DA1.1 +DS1.1 endif else ifeq ($(buildbits),64) ifeq ($(itanium),1) + CFLAGS += +DD64 CCFLAGS += +DD64 else ifeq ($(word 2,$(HPVERS_WORDS)), 11) ## Without the W, it isn't really a 64-bit build + CFLAGS += +DA2.0W +DS2.0W CCFLAGS += +DA2.0W +DS2.0W else + CFLAGS += +DA2.0 +DS2.0 CCFLAGS += +DA2.0 +DS2.0 endif endif @@ -194,6 +199,7 @@ LDFLAGS += -Wl,+vnocompatwarnings else ifneq ($(itanium),1) # HP aCC on Itanium doesn't support this option, defaults to 32bit then. + CFLAGS += +DAportable CCFLAGS += +DAportable endif endif diff --git a/include/makeinclude/platform_irix6.x_sgic++.GNU b/include/makeinclude/platform_irix6.x_sgic++.GNU index d51f4876570..933f43db38d 100644 --- a/include/makeinclude/platform_irix6.x_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x_sgic++.GNU @@ -35,6 +35,7 @@ DCCFLAGS += -g # Enable 64-bit builds ifeq (64,$(buildbits)) + CFLAGS += -64 CPPFLAGS += -64 endif diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 58f504faf9b..62c9dcfc62b 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -13,7 +13,7 @@ # platform_macros.GNU file such as this can be used: # fast=1 # include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU -# CCFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific! +# CFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific! # SOFLAGS += -xtarget=ultra2 -xarch=v9a # LDFLAGS += -L/opt/SUNWspro/SC5.0/lib/v9 -L/usr/lib/sparcv9 # Please note that the xtarget and xarch settings are specific to @@ -51,6 +51,10 @@ ace_with_x11 ?= 0 no_hidden_visibility ?= 1 templates ?= automatic +## If you set this to 1 you will need to add -xarch=v8plus (or higher) +## to CFLAGS or the assembler code will not compile +atomic_ops_sparc ?= 0 + PLATFORM_TK_CPPFLAGS= PLATFORM_TK_LIBS=-ltk -ltcl PLATFORM_TK_LDFLAGS= @@ -83,6 +87,10 @@ else endif endif +ifeq ($(atomic_ops_sparc),1) + CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC +endif + #### The following macro overrides enable creation of fast executables. #### They _don't_ support fast compilation :-) #### To use, add fast=1 to your "make" invocation. @@ -181,10 +189,10 @@ else # ! 4.2 # from CCFLAGS in a private platform_macros.GNU file. ifeq (64,$(buildbits)) ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - CCFLAGS += -xarch=generic64 + CFLAGS += -xarch=generic64 LDFLAGS += -xarch=generic64 else - CCFLAGS += -xarch=v9 + CFLAGS += -xarch=v9 LDFLAGS += -xarch=v9 endif # C++ 5.7 endif # buildbits |