diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-03-15 18:21:08 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-03-15 18:21:08 +0000 |
| commit | 9bad44033473686ffcc525eab586bbaf290d37dd (patch) | |
| tree | d2eb3eb004f149348f52637052efdedb1f368241 | |
| parent | 2a41ad33301541bd9336c6684cf5b8edd0d6900e (diff) | |
| download | ATCD-9bad44033473686ffcc525eab586bbaf290d37dd.tar.gz | |
ChangeLogTag: Fri Mar 15 12:19:58 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks5.x_ghs.GNU | 26 |
4 files changed, 39 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 2502b091665..37adf2fe11b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 15 12:19:58 2002 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_ghs.GNU: + + Added support for building with exceptions enabled. + Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE) diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 2502b091665..37adf2fe11b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Mar 15 12:19:58 2002 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_ghs.GNU: + + Added support for building with exceptions enabled. + Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE) diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2502b091665..37adf2fe11b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Mar 15 12:19:58 2002 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_ghs.GNU: + + Added support for building with exceptions enabled. + Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE) diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU index 0fdf04dd0c3..dbb17b882a2 100644 --- a/include/makeinclude/platform_vxworks5.x_ghs.GNU +++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU @@ -38,12 +38,18 @@ VXWORKS = 1 CROSS-COMPILE = 1 -debug = 1 -optimize = 1 +ifndef debug + debug = 1 +endif +ifndef optimize + optimize = 1 +endif +ifndef rtti + rtti = 0 +endif # rtti shared_libs = static_libs = 1 - #### CPU type ifndef CPU CPU = ppc @@ -81,11 +87,16 @@ endif # ppc endif # CPU #### For GHS 1.8.9: -LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a $(GHS)/liblockinit_sc.o $(GHSROOT)/$(CPU)/libarch.a +ifeq (1,$(exceptions)) + LIBS += $(GHS)/libsce.a $(GHS)/libsedge.a $(GHS)/setup_eh.o +else + LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a +endif +LIBS += $(GHS)/liblockinit_sc.o $(GHSROOT)/$(CPU)/libarch.a CC = cxvx$(CPU) CXX = $(CC) -CCFLAGS += $(CFLAGS) --no_rtti -tnone -Dghs -I$(GHSROOT)/vxworks/include -I$(WIND_BASE)/target/h +CCFLAGS += $(CFLAGS) -tnone -Dghs -I$(GHSROOT)/vxworks/include -I$(WIND_BASE)/target/h DCFLAGS += -g SOFLAGS += -shared DLD = $(CXX) @@ -96,4 +107,9 @@ PIC = ifeq (1, $(exceptions)) CCFLAGS += --stdle --exceptions + override rtti = 1 endif # exceptions + +ifeq (0, $(rtti)) + CCFLAGS += --no_rtti +endif # rtti |