diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-21 20:27:54 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-21 20:27:54 +0000 |
| commit | 86bb801dbd52b267ba0ac9011380c786bb55b4a5 (patch) | |
| tree | 97667e6b2a76850086fc4bdedda1bcc838bf588c /include/makeinclude | |
| parent | 7d64b920e1746255da9e8a4ef5fa6ea1859bbf87 (diff) | |
| download | ATCD-86bb801dbd52b267ba0ac9011380c786bb55b4a5.tar.gz | |
Updated for Chorus 4.0 on PowerPC and Ultra-SPARC.
Expected ACE tests run. (except IOStream_Test on Ultra-SPARC)
Chad Elliott
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_chorus.GNU | 14 | ||||
| -rw-r--r-- | include/makeinclude/platform_chorus4.x_g++.GNU | 13 |
2 files changed, 19 insertions, 8 deletions
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU index 83ec4941d8d..e7c9b316b49 100644 --- a/include/makeinclude/platform_chorus.GNU +++ b/include/makeinclude/platform_chorus.GNU @@ -26,9 +26,12 @@ endif #CLX_CDSHOST ifndef CLASSIXDIR CLASSIXDIR=$(MERGEDIR) endif #CLASSIXDIR +ifndef CPU + CPU=powerpc +endif -XROOT = $(CLX_CDSPATH)/powerpc/$(CLX_CDSHOST)/$(CLX_CDSVERSION) -XDIR = $(XROOT)/powerpc-elf +XROOT = $(CLX_CDSPATH)/$(CPU)/$(CLX_CDSHOST)/$(CLX_CDSVERSION) +XDIR = $(XROOT)/$(CPU)-elf CC = $(XDIR)/bin/gcc -B$(XROOT)/lib/gcc-lib/ # @@ -51,15 +54,18 @@ CCFLAGS += $(CFLAGS) -fno-implicit-templates \ -nostdinc \ -pipe \ -fno-rtti \ - -mstrict-align \ -fwritable-strings \ -fsigned-char \ "-msoft-float" \ - -mno-sdata \ -D_POSIX_THREADS \ -D_POSIX_THREAD_SAFE_FUNCTIONS \ "-DNO_FPU_SUPPORT" +ifeq ($(CPU),powerpc) +CCFLAGS += -mstrict-align \ + -mno-sdata +endif + ifeq ($(exceptions),1) else # ! exceptions CCFLAGS += -fno-exceptions diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU index b0b06251dd3..265eafbbbfc 100644 --- a/include/makeinclude/platform_chorus4.x_g++.GNU +++ b/include/makeinclude/platform_chorus4.x_g++.GNU @@ -9,9 +9,10 @@ # You will probably need to set the following environment variables # or macros: # -# CLX_CDSPATH <chorus install path>/4.0/chorus-powerpc/tools +# CPU powerpc or sparc or ... +# CLX_CDSPATH <chorus install path>/4.0/chorus-$CPU/tools # CLX_CDSVERSION 5.00 -# MERGEDIR <chorus install path>/4.0/chorus-powerpc/kernel +# MERGEDIR <chorus install path>/4.0/chorus-$CPU/kernel # include $(ACE_ROOT)/include/makeinclude/platform_chorus.GNU @@ -29,11 +30,15 @@ INCLDIRS := -I$(INC_DIR) \ -I$(OS_INCLDIR)/CC \ $(INCLDIRS) -DCFLAGS += -g +# +# Adding debug symbols makes the binaries too +# large to load into memory. +#DCFLAGS += -g +# CCFLAGS += -DCHORUS_4 -D_POSIX_THREAD_PROCESS_SHARED # -# Special link process to get the right libraries and +# Special link process to get the right libraries and # build up the static constructors and destructors. # POSTLINK= -r $(OS_DIR)/lib/CC/libC.a $(OS_DIR)/lib/libbsd/libbsd.a \ |