summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/ChangeLog8
-rw-r--r--make/custom/arm_bare_bsp.cfg2
-rw-r--r--make/custom/armulator.cfg2
-rw-r--r--make/custom/csb336.cfg3
-rw-r--r--make/custom/csb337.cfg3
-rw-r--r--make/custom/edb7312.cfg3
-rw-r--r--make/custom/jmr3904.cfg4
-rw-r--r--make/custom/pc486.cfg4
-rw-r--r--make/custom/pc586.cfg4
-rw-r--r--make/custom/pc686.cfg4
-rw-r--r--make/custom/pck6.cfg5
-rw-r--r--make/custom/vegaplus.cfg2
12 files changed, 32 insertions, 12 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index 0a0cdbd200..f3d800b893 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-20 Joel Sherrill <joel@OARcorp.com>
+
+ * custom/arm_bare_bsp.cfg, custom/armulator.cfg, custom/csb336.cfg,
+ custom/csb337.cfg, custom/edb7312.cfg, custom/jmr3904.cfg,
+ custom/pc486.cfg, custom/pc586.cfg, custom/pc686.cfg,
+ custom/pck6.cfg, custom/vegaplus.cfg: Correct use of arguments for
+ gcc 4.x. Hopefully they are still OK for gcc 3.3.5.
+
2005-01-01 Ralf Corsepius <ralf.corsepius@rtems.org>
* compilers/gcc-portsw.cfg: Remove.
diff --git a/make/custom/arm_bare_bsp.cfg b/make/custom/arm_bare_bsp.cfg
index 9050056590..2486a124fd 100644
--- a/make/custom/arm_bare_bsp.cfg
+++ b/make/custom/arm_bare_bsp.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=arm_bare_bsp
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS = -msoft-float
+# CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/armulator.cfg b/make/custom/armulator.cfg
index 6f063eb163..1a96a9587f 100644
--- a/make/custom/armulator.cfg
+++ b/make/custom/armulator.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=armulator
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS = -msoft-float
+# CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/csb336.cfg b/make/custom/csb336.cfg
index 9d9d0d4780..6b436c005e 100644
--- a/make/custom/csb336.cfg
+++ b/make/custom/csb336.cfg
@@ -15,7 +15,8 @@ RTEMS_BSP_FAMILY=csb336
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
-CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8 -msoft-float
+CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8
+#CPU_CFLAGS += -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/csb337.cfg b/make/custom/csb337.cfg
index a33c08998f..ac186daf9d 100644
--- a/make/custom/csb337.cfg
+++ b/make/custom/csb337.cfg
@@ -15,7 +15,8 @@ RTEMS_BSP_FAMILY=csb337
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
-CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8 -msoft-float
+CPU_CFLAGS = -mcpu=arm920 -mstructure-size-boundary=8
+CPU_CFLAGS += -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/edb7312.cfg b/make/custom/edb7312.cfg
index 6a34659dfb..30b60f5793 100644
--- a/make/custom/edb7312.cfg
+++ b/make/custom/edb7312.cfg
@@ -15,7 +15,8 @@ RTEMS_BSP_FAMILY=edb7312
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
-CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8 -msoft-float
+CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8
+# CPU_CFLAGS += -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/jmr3904.cfg b/make/custom/jmr3904.cfg
index f8ac82f6c4..3aa7135b40 100644
--- a/make/custom/jmr3904.cfg
+++ b/make/custom/jmr3904.cfg
@@ -18,7 +18,7 @@ RTEMS_BSP_FAMILY=jmr3904
# gcc 2.95.x and 3.0
#CPU_CFLAGS=-m3900 -G0
# gcc 3.1 and newer
-CPU_CFLAGS=-march=r3900 -G0
+CPU_CFLAGS=-march=r3900 -Wa,-xgot -G0
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
@@ -29,7 +29,7 @@ CFLAGS_OPTIMIZE_V=-O2 -g
# will be able to override parts of the compilers specs and link using gcc.
define make-exe
- $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ $(LINK.c) $(AM_CFLAGS) -G0 $(AM_LDFLAGS) \
$(LDLIBS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
$(NM) -g -n $@ > $(basename $@).num
diff --git a/make/custom/pc486.cfg b/make/custom/pc486.cfg
index dca45047af..feb3b91de5 100644
--- a/make/custom/pc486.cfg
+++ b/make/custom/pc486.cfg
@@ -8,7 +8,9 @@ RTEMS_CPU_MODEL=i486dx
# gcc 2.95.x and 3.0
#CPU_CFLAGS = -m486
# gcc 3.1 and newer
-CPU_CFLAGS=-mcpu=i486
+# CPU_CFLAGS=-mcpu=i486
+# gcc 4.0 and newer
+CPU_CFLAGS=-mtune=i486
include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pc586.cfg b/make/custom/pc586.cfg
index 079ea8606a..98158e377e 100644
--- a/make/custom/pc586.cfg
+++ b/make/custom/pc586.cfg
@@ -8,7 +8,9 @@ RTEMS_CPU_MODEL=pentium
# gcc 2.95.x and 3.0
#CPU_CFLAGS = -mpentium
# gcc 3.1 and newer
-CPU_CFLAGS=-mcpu=pentium
+# CPU_CFLAGS=-mcpu=pentium
+# gcc 4.0 and newer
+CPU_CFLAGS=-mtune=pentium
include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pc686.cfg b/make/custom/pc686.cfg
index a377e05ec7..e2aacdb6b1 100644
--- a/make/custom/pc686.cfg
+++ b/make/custom/pc686.cfg
@@ -8,7 +8,9 @@ RTEMS_CPU_MODEL=pentiumpro
# gcc 2.95.x and 3.0
#CPU_CFLAGS = -mpentiumpro
# gcc 3.1 and newer
-CPU_CFLAGS=-mcpu=pentiumpro
+# CPU_CFLAGS=-mcpu=pentiumpro
+# gcc 4.0 and newer
+CPU_CFLAGS=-mtune=pentiumpro
include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/pck6.cfg b/make/custom/pck6.cfg
index d8d84a9f2c..7cfbfa8358 100644
--- a/make/custom/pck6.cfg
+++ b/make/custom/pck6.cfg
@@ -5,6 +5,9 @@
#
RTEMS_CPU_MODEL=pentium
-CPU_CFLAGS = -mcpu=k6
+# gcc 3.1 and newer
+# CPU_CFLAGS = -mcpu=k6
+# gcc 4.0 and newer
+CPU_CFLAGS = -mtune=k6
include $(RTEMS_ROOT)/make/custom/pc386.cfg
diff --git a/make/custom/vegaplus.cfg b/make/custom/vegaplus.cfg
index 98011d2aa4..e502128ceb 100644
--- a/make/custom/vegaplus.cfg
+++ b/make/custom/vegaplus.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=vegaplus
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS = -msoft-float
+# CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS