Redo the way 'munch' commands are handled.

Provide 'munch' command to build executable for RTEMS MVME2100 target.

configure/CONFIG_COMMON

@@ -284,8 +284,8 @@ ARFLAGS =
 ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
-# ld default
-LDCMD = $(LD) -o $@ $^
+# 'Munch' link-edit
+MUNCH_CMD = $(LD) -o $@ $^
 
 #--------------------------------------------------
 # Build compile line here

configure/RULES_BUILD

@@ -287,13 +287,13 @@ $(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LI
 	@$(RM) $@
 	$(PERL) $(TOOLS)/munch.pl <  $< > $@
 
-$(MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(EXE)
+$(MUNCHNAME):%$(MUNCH_SUFFIX) : $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
-	$(LDCMD)
+	$(MUNCH_CMD)
 
 $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
-	$(LDCMD)
+	$(MUNCH_CMD)
 
 # Ext, app and module rules
 RULES_INCLUDE CONFIG_APP_INCLUDE: $(wildcard $(TOP)/configure/RELEASE*)

configure/os/CONFIG.Common.RTEMS

@@ -46,7 +46,7 @@ VALID_BUILDS = Ioc
 # through the following contortions to get the EPICS flags back.
 CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+ $(CODE_CFLAGS) $(STATIC_CFLAGS)  $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -6,6 +6,22 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=powerpc
+RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
+	gzip -f9 rtems
+	$(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -o $@ \
+		 $(PROJECT_RELEASE)/lib/bootloader.o \
+		--just-symbols=$< \
+		-b binary rtems.gz \
+		-T $(PROJECT_RELEASE)/lib/ppcboot.lds \
+		-Map $<.map
+	rm -f rtems.gz
+endef
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS
+OP_SYS_LDLIBS += -lrtemsNfs

configure/os/CONFIG.Common.vxWorksCommon

@@ -49,6 +49,7 @@ MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 CTDT_SRCS = $(PRODNAME:%$(EXE)=%_ctdt.c)
 CTDT_OBJS = $(PRODNAME:%$(EXE)=%_ctdt$(OBJ))
 NMS = $(PRODNAME:%$(EXE)=%.nm)
+MUNCH_DEPENDS = %_ctdt$(OBJ)
 
 #-------------------------------------------------------
 # R3.13 compatability object library definitions

configure/os/CONFIG.win32-x86.win32-x86

@@ -215,7 +215,7 @@ DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$*)))
 #
 LINK.shrlib = $(WINLINK) /nologo $(WIN32_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
 LINK.shrlib += $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-LDCMD =  $(CCC) /Fo $@ $^
+MUNCH_CMD =  $(CCC) /Fo $@ $^
 
 
 #	adjust names of libraries to build

configure/os/CONFIG_SITE.Common.darwin-ppc

@@ -9,5 +9,5 @@
 #
 # Other local options
 #
-#OP_SYS_CFLAGS += -g
+OP_SYS_CFLAGS += -g
 #COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.linux-x86

@@ -20,3 +20,4 @@
 # If readline is not installed comment the following line
 # to omit command-line editing and history support
 COMMANDLINE_LIBRARY = READLINE
+OP_SYS_CFLAGS += -g

configure/os/CONFIG_SITE.Common.solaris-sparc

@@ -8,5 +8,4 @@
 # If readline is installed uncomment the following macro definition
 # to include command-line editing and history support
 #
-#COMMANDLINE_LIBRARY = READLINE
-
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.linux-x86.Common

@@ -9,3 +9,4 @@
 # JBA test override values
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 # RTEMS-mvme167

configure/os/CONFIG_SITE.solaris-sparc.Common

@@ -7,3 +7,4 @@
  
 #INSTALL_LOCATION = /home/phoebus/JBA/testBaseNew
 
+CROSS_COMPILER_TARGET_ARCHS += vxWorks-ppc604 vxWorks-ppc603 vxWorks-68040