summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-04-03 20:01:31 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-04-03 20:01:31 +0000
commitc34eb10f5565c0043f9b04420f73cdf8639e3135 (patch)
treec2427937df3311452e9f0f9ab110d59a34e3fba5 /make
parentThis commit was manufactured by cvs2svn to create branch 'rtems-4-5-branch'. (diff)
downloadrtems-c34eb10f5565c0043f9b04420f73cdf8639e3135.tar.bz2
Patch rtems-rc-4.5.0-7-cvs.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>.
The patch contains: * Many small cleanups wrt. make VARIANT=[DEBUG|PROFILE] support * several modifications to make/custom/*.cfg * Merger with the mvme2307.cfg you had posted two weeks ago (Please check it, I did not check it against to version you posted today). * Added a check to the toplevel configure.in to refuse building inside of the source tree.
Diffstat (limited to 'make')
-rw-r--r--make/custom/mvme2307.cfg19
-rw-r--r--make/custom/ods68302.cfg2
-rw-r--r--make/custom/rxgen960.cfg3
3 files changed, 15 insertions, 9 deletions
diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg
index 62524c4750..bac65d2d48 100644
--- a/make/custom/mvme2307.cfg
+++ b/make/custom/mvme2307.cfg
@@ -66,13 +66,21 @@ endef
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
-CPU_CFLAGS = -mcpu=604
+CPU_CFLAGS = -mcpu=604 -mmultiple -mstring -mstrict-align
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
# NOTE: some level of -O may be actually required by inline assembler
#CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align -mcpu=604
+CFLAGS_OPTIMIZE_V = -O4
+
+# debug flags: typically none, but at least -O1 is required due to this
+# BSP using inlined code
+CFLAGS_DEBUG_V = -O1
+
+# profile flags: typically none, but at least -O1 is required due to this
+# BSP using inlined code
+CFLAGS_PROFILE_V = -O1
# The following is a linkcmds file which will work without using the
# -specs system in gcc 2.8.
@@ -87,12 +95,11 @@ CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align -mcpu=604
# $(LD_LIBS) \
# -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
define make-exe
- $(LINK.c) $(LDLIBS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
$(NM) -g -n $@ > $(basename $@).num
$(SIZE) $@
-#
-# The following builds bootable images for the board. But the way
-# the build procedure jumps around the tree is not cool.
+# The following commands make a bootable image but will not work outside
+# the build tree.
# test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin
# $(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \
# ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \
diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg
index 229f9b0d4b..d5ef6ac8b3 100644
--- a/make/custom/ods68302.cfg
+++ b/make/custom/ods68302.cfg
@@ -71,7 +71,7 @@ define make-exe
endef
else
define make-exe
- $(LINK.c) $(LDLIBS) \
+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-Wl,-defsym -Wl,MC68302_BASE=$(MC68302_BASE) \
-o $@ \
$(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/rxgen960.cfg b/make/custom/rxgen960.cfg
index b1e33fa871..59867642b8 100644
--- a/make/custom/rxgen960.cfg
+++ b/make/custom/rxgen960.cfg
@@ -62,8 +62,7 @@ define make-exe
endef
else
define make-exe
- $(LINK.c) \
- $(LDLIBS) -o $@ \
+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
$(NM) -g -n $@ > $(basename $@).num
$(OBJCOPY) -oformat binary $@ $(basename $@).bin