summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_gnuwin32_common.GNU10
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU60
-rw-r--r--include/makeinclude/platform_hpux_gcc.GNU2
-rw-r--r--include/makeinclude/platform_linux.GNU5
-rw-r--r--include/makeinclude/platform_linux_icc.GNU32
-rw-r--r--include/makeinclude/platform_netbsd.GNU45
-rw-r--r--include/makeinclude/platform_openvms.GNU14
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU4
-rw-r--r--include/makeinclude/rules.local.GNU6
-rw-r--r--include/makeinclude/wrapper_macros.GNU2
10 files changed, 62 insertions, 118 deletions
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index 39884825b0d..4044c2b83c1 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -55,11 +55,7 @@ CC = gcc
CXX = g++
RC = windres
-ifeq (3.4,$(findstring 3.4,$(GNUWIN32_CXX_VERSION)))
- MODEL_FLAGS += -mtune=$(TCPU)
-else
- MODEL_FLAGS += -mcpu=$(TCPU)
-endif
+MODEL_FLAGS += -mcpu=$(TCPU)
CFLAGS += -W -Wall -Wpointer-arith
ifeq ($(threads),1)
@@ -99,7 +95,7 @@ SHLIBBUILD = \
&& mv $(VSHDIR)/$@.def $(VSHDIR)/$@.def.old \
&& sed 's/;.*$$//g' < $(VSHDIR)/$@.def.old > $(VSHDIR)/$@.def \
&& $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a \
- -shared -o $@ $(LDFLAGS) -Wl,$(VSHDIR)/$@.def \
+ -shared -o $@ $(LDFLAGS) $(VSHDIR)/$@.def \
$(VSHOBJS1) $(ACE_SHLIBS) $(LIBS)
ifneq ($(GNUWIN32_DLL_ALLOW_EXECP), 1)
@@ -111,7 +107,7 @@ endif
PRELIB = @true
-# Test for template instantiation, add to SOFLAGS if SONAME set,
+# Test for template instantiation, add to SOFLAGS if SONAME set,
# add -E to LDFLAGS if using GNU ld
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 026de1cb662..4a1031b8b61 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -39,25 +39,21 @@ endif
# 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)))
#
CC = /bin/cc
CXX = aCC
-# Determine compiler version
-CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
-CXXMINORVERS := $(word 8, $(CXXVERS_WORDS))
-CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS))
-
ifeq (,$(stdcpplib))
# If the user didn't explicitly set stdcpplib, assume that the compiler
# can do -AA, unless it's a .2x version (e.g., 03.24). 03.27 can do -AA,
# so check for that one explicitly and enable it if so.
- ifeq (,$(filter 2%,$(CXXMINORVERS)))
+ CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
+ CXXVERS := $(word 8, $(CXXVERS_WORDS))
+ ifeq (,$(filter 2%,$(CXXVERS)))
stdcpplib = 1
else
- ifeq (27,$(CXXMINORVERS))
+ ifeq (27,$(CXXVERS))
stdcpplib = 1
else
stdcpplib = 0
@@ -67,22 +63,15 @@ endif
ifeq (1,$(stdcpplib))
CCFLAGS += -AA
- ifeq (03,$(CXXMAJORVERS))
- # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
- # as support call 3201224717. (Steve Huston, 23-Nov-2002)
- CCFLAGS += +W930
- endif
+ # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
+ # as support call 3201224717. (Steve Huston, 23-Nov-2002)
+ CCFLAGS += +W930
# Compile errors using -AA and +noeh together - HP problem report
# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001.
# If you still have problems with this area, uncomment the following line:
# exceptions = 1
endif
-ifeq (05,$(CXXMAJORVERS))
- # Warnings about binary incompatiblity
- CCFLAGS += +W1016,1031
-endif
-
# Set the appropriate preprocessor defs for threading based on OS version
# and specified compiler options.
ifeq ($(threads),1)
@@ -108,14 +97,8 @@ else
endif
endif
-ifeq ($(HPMODEL), ia64)
- itanium = 1
-endif
-
-ifeq (03,$(CXXMAJORVERS))
- # Suppress Warning 302 ((...) parameter list is a non-portable feature)
- CCFLAGS += +W302
-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
# If exception support is explicitly disabled, tell the compiler.
@@ -143,7 +126,7 @@ AR = /usr/ccs/bin/ar
ARFLAGS = ruv
RANLIB = echo
LDFLAGS = -Wl,+s -z
-SOFLAGS += -b
+SOFLAGS += -b
ifeq ($(distrib),1)
@@ -163,29 +146,18 @@ endif
SOEXT = sl
ifeq ($(buildbits),32)
- ifeq ($(itanium),1)
- CCFLAGS += +DD32
- else
- CCFLAGS += +DA1.1 +DS1.1
- endif
+CCFLAGS += +DA1.1 +DS1.1
else
ifeq ($(buildbits),64)
- ifeq ($(itanium),1)
- CCFLAGS += +DD64
+ ifeq ($(word 2,$(HPVERS_WORDS)), 11)
+ ## Without the W, it isn't really a 64-bit build
+ CCFLAGS += +DA2.0W +DS2.0W
else
- 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
+ CCFLAGS += +DA2.0 +DS2.0
endif
LDFLAGS += -Wl,+vnocompatwarnings
else
- ifneq ($(itanium),1)
- # HP aCC on Itanium doesn't support this option, defaults to 32bit then.
- CCFLAGS += +DAportable
- endif
+CCFLAGS += +DAportable
endif
endif
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
index 1f9e1e2207a..7073cce4c48 100644
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -95,7 +95,7 @@ else
endif
-# Test for template instantiation, add to SOFLAGS if versioned_so set,
+# Test for template instantiation, add to SOFLAGS if versioned_so set,
# add -E to LDFLAGS if using GNU ld
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index cbc26622554..c8dd8c8c201 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -47,7 +47,7 @@ PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS)
PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS)
PLATFORM_AIO_SUPPORT := \
- $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
+ $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
ssl ?= 0
ifeq ($(ssl),1)
@@ -94,8 +94,7 @@ LIBS += -ldl
ifeq ($(threads),1)
LIBS += -lpthread
endif
-# look for the rt library in the usual places
-LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
+LIBS += $(shell test -e /usr/lib/librt.so && echo -lrt)
PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include
PLATFORM_QT_LIBS=-lqt
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index df8ee77e647..2709f2f616f 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -52,25 +52,26 @@ PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS)
PLATFORM_AIO_SUPPORT := \
$(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
+#
+# Intel compiler comes in two flavors with different binaries. The first,
+# icc, is for IA32 platforms and the second, ecc, is for IA64 platforms.
+# They share most options except those influencing target machine code
+# generation, therefore we should pick sensible defaults for both
+# depending on system architecture.
+#
SYSARCH := $(shell uname -m)
ifeq ($(insure),1)
- CC = insure
- CXX = insure
+CC = insure
+CXX = insure
else
- CC = icc
- CXX = icc
-endif
-
-ifndef CXX_VERSION
- CXX_VERSION := $(shell $(CXX) --version)
-endif
-
-ifeq (8.0,$(findstring 8.0,$(CXX_VERSION)))
- CFLAGS += -wd1476,1505
-endif
-ifeq (8.1,$(findstring 8.1,$(CXX_VERSION)))
- CFLAGS += -wd1476,1505 -no-gcc
+ ifeq ($(SYSARCH),ia64)
+ CC = ecc
+ CXX = ecc
+ else
+ CC = icc
+ CXX = icc
+ endif
endif
CFLAGS += -w1
@@ -78,6 +79,7 @@ ifeq ($(threads),1)
CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT)
endif # threads
+
CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -ip
DCFLAGS += -g
DLD = $(CXX)
diff --git a/include/makeinclude/platform_netbsd.GNU b/include/makeinclude/platform_netbsd.GNU
index 2ee9697cabd..f847b5e03d2 100644
--- a/include/makeinclude/platform_netbsd.GNU
+++ b/include/makeinclude/platform_netbsd.GNU
@@ -2,54 +2,33 @@
# platform_netbsd.GNU
-versioned_so = 1
-
-ifndef exceptions
- exceptions = 1
-endif
-
-ifeq (,$(debug))
- debug = 1
-endif
-
-ifeq (,$(optimize))
- optimize = 1
-endif
-
-ifeq (,$(threads))
- threads = 1
-endif
+# ***** Notice: This file is still under testing. *****
+# To be used on netbsd platform without pthread support.
-pipes ?= 1
+debug = 1
+optimize = 1
+versioned_so = 1
CC = gcc
CXX = g++
-CFLAGS += -W -Wall -Wpointer-arith
+CFLAGS += -w -fno-strict-prototypes
DCFLAGS += -g
-LDFLAGS += -Wl,-rpath $(ACE_ROOT)/ace
-DLD = $(CXX)
+DLD = ld
LD = $(CXX)
-LIBS +=
-OCFLAGS += -O2
-PIC = -fpic
+LIBS += -lstdc++ #-lcompat -lresolv
+##OCFLAGS += -O2
+PIC = -fpic -DPIC
AR = ar
ARFLAGS = ruv
RANLIB = ranlib
-SOFLAGS += $(CPPFLAGS) -shared
+SOFLAGS += -Bshareable -x /usr/lib/c++rt0.o
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = @echo
-ifeq ($(threads),1)
-LDFLAGS += -pthread
-CFLAGS += -D_REENTRANT -DACE_HAS_THREADS
-endif # threads
-
-# Test for template instantiation, add to SOFLAGS if versioned_so set,
+# Test for template instantiation, add to SOFLAGS if SONAME set,
# add -E to LDFLAGS if using GNU ld
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG)
-
diff --git a/include/makeinclude/platform_openvms.GNU b/include/makeinclude/platform_openvms.GNU
index 7cb18f81cb3..f30157eec0e 100644
--- a/include/makeinclude/platform_openvms.GNU
+++ b/include/makeinclude/platform_openvms.GNU
@@ -33,7 +33,7 @@ CFLAGS += -ieee
DCFLAGS += -g
OCFLAGS += -O
-#MATHLIB = -lm
+MATHLIB = -lm
PIC =
ARFLAGS = -c
RANLIB = @true
@@ -46,14 +46,8 @@ CXX = cxx
LD = $(CXX)
DLD = $(CXX)
SOVERSION =
-SOEXT = exe
-EXEEXT = .exe
-INSLIB = $(ACE_ROOT)/lib
+SOEXT = exe
+EXEEXT = .exe
+INSLIB = $(ACE_ROOT)/lib
REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
$(CLEANUP_BIN:%=%.DSF)
-
-ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(VMS_DUMMY_)
-endif
-
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 0e32bec299c..56ba08da116 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -214,9 +214,9 @@ endif # ! exceptions
LD = $(CXX)
ifeq ($(distrib),0)
- LDFLAGS += -R $(ACE_ROOT)/lib -R./
+ LDFLAGS += -R $(ACE_ROOT)/ace -R./
endif
- LIBS += -lsocket -ldl -lnsl -lgen -lposix4 -ladm
+ LIBS += -lsocket -ldl -lnsl -lgen -lposix4
LDFLAGS += -xildoff
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index d9ac5b6a581..3d2dd688edb 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -83,7 +83,9 @@ build.local: $(VBUILD)
STATIC_LINK_FLAG ?=
static_link ?= 0
ifeq ($(static_link),1)
- LDFLAGS += $(STATIC_LINK_FLAG)
+ ifeq ($(static_libs_only),1)
+ LDFLAGS += $(STATIC_LINK_FLAG)
+ endif # static_libs_only = 1
endif # static_link = 1
OS ?=
@@ -405,7 +407,7 @@ depend.local: $(MAKEFILE) idl_stubs.local
ACE_PLATFORM_CONFIG=$(ACE_PLATFORM_CONFIG) \
ACE_DEPEND_SED_CMD="$(ACE_DEPEND_SED_CMD)" \
$(DEPGEN) -A $(DEPEND_CMD_ARGS) -e config.h -f $(DEPENDENCY_FILE) $(CPPFLAGS) \
- -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC)
+ -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
@if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\
then echo "GNUmakefile dependencies unchanged." ;\
else \
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 9e0d59f5525..b6398602ff1 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -793,7 +793,7 @@ ace_codecs ?= 1
ace_token ?= 1
ace_svcconf ?= 1
ace_uuid ?= 1
-ace_filecache ?= 1
+ace_filecahce ?= 1
#----------------------------------------------------------------------------
# Conditional macro definitions
View Lorry Controller Status