diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-12-02 08:32:40 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-12-02 08:32:40 +0000 |
| commit | 108dd6142c0af9e2c9b97c3d5d6405a3b9ca99ef (patch) | |
| tree | 0363f4231b6ac3a182c86a7e1d592a3672c1b00c | |
| parent | bf0e95445873fe3043a07ed7575033ac300839da (diff) | |
| download | ATCD-108dd6142c0af9e2c9b97c3d5d6405a3b9ca99ef.tar.gz | |
ChangeLogTag: Thu Dec 2 08:32:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks5.5.x.GNU | 28 |
2 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 56bfbd273d0..a6b819a81d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 2 08:32:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_vxworks5.5.x.GNU: + Changed template handling to allow implicit template instantiation + with VxWorks GNU toolchain. + Wed Dec 1 15:01:39 2004 Steve Huston <shuston@riverace.com> * examples/APG/Threads/Guards.cpp: diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU index 9e83e3d808b..5e5f54c7ee2 100644 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/include/makeinclude/platform_vxworks5.5.x.GNU @@ -78,6 +78,12 @@ else endif override TOOL_FAMILY := $(TOOL) +ifeq ("$(TOOL)","gnu") +ifndef templates + templates = automatic +endif # ! templates +endif + PRJ_TYPE = vxApp TGT_DIR = $(WIND_BASE)/target @@ -153,6 +159,22 @@ ifeq ($(debug),1) CPPFLAGS += endif +ifeq ("$(TOOL)","gnu") +# 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 + +ifeq ("$(templates)","automatic") +TEMPLATES_FLAG=-fmerge-templates +endif + +# TEMPLATES_FLAG is set by platform_g++_common.GNU +ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS + C++FLAGS += $(TEMPLATES_FLAG) +endif +endif # TOOl == gnu + ifeq ("$(TOOL)","diab") ifeq ($(exceptions),1) C++FLAGS += -Xexceptions @@ -171,7 +193,11 @@ endif ifeq (0,$(rtti)) #### Don't use RTTI, because Tornado 1.0.x libraries don't support it. - C++FLAGS += -DACE_LACKS_RTTI +ifeq ("$(TOOL)","gnu") + C++FLAGS += -fno-rtti -DACE_LACKS_RTTI +else + C++FLAGS += -Xrtti-off -DACE_LACKS_RTTI +endif endif # rtti ifneq ($(optimize),1) |