summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-01 15:44:04 +0000
committeroci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-01 15:44:04 +0000
commit9d45f809a4fba07d0c9801e5c56460707b0df7cd (patch)
treeb3b269e663c1ebb5abfb15313d6891483b441e6c
parent2f74b42b7efa6d2882042f3622b351a7a5e0ac12 (diff)
downloadATCD-9d45f809a4fba07d0c9801e5c56460707b0df7cd.tar.gz
ChangeLogTag: Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-02a7
-rw-r--r--ChangeLogs/ChangeLog-03a7
-rw-r--r--include/makeinclude/platform_chorus4.x_g++.GNU13
4 files changed, 31 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3db10499929..61d5458ad36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+ Modification to allow building for Chorus 4.x on x86. CPU will be
+ set to x86, but CLX_TYPE will be set to i486-elf-sysv4.
+
Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com>
* ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3db10499929..61d5458ad36 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+ Modification to allow building for Chorus 4.x on x86. CPU will be
+ set to x86, but CLX_TYPE will be set to i486-elf-sysv4.
+
Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com>
* ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3db10499929..61d5458ad36 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+ Modification to allow building for Chorus 4.x on x86. CPU will be
+ set to x86, but CLX_TYPE will be set to i486-elf-sysv4.
+
Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com>
* ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed
diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU
index 4f1f1114423..81eb6949263 100644
--- a/include/makeinclude/platform_chorus4.x_g++.GNU
+++ b/include/makeinclude/platform_chorus4.x_g++.GNU
@@ -24,9 +24,13 @@
CHORUS = 1
CROSS-COMPILE = 1
-debug = 1
+ifeq (,$(debug))
+ debug = 1
+endif
exceptions = 0
-optimize = 1
+ifeq (,$(optimize))
+ optimize = 1
+endif
static_libs_only = 1
#
@@ -44,6 +48,9 @@ endif
ifndef CPU
CPU=powerpc
endif
+ifndef CLX_TYPE
+ CLX_TYPE=$(CPU)-elf
+endif
ifndef CLX_CDSVERSION
CLX_CDSVERSION = 5.00
endif
@@ -55,7 +62,7 @@ ifndef OS_DIR
endif
XROOT = $(CHTOOLS_DIR)/$(CPU)/$(CLX_CDSHOST)/$(CLX_CDSVERSION)
-XDIR = $(XROOT)/$(CPU)-elf
+XDIR = $(XROOT)/$(CLX_TYPE)
TOOLDIR = $(XDIR)/bin