From 84ada50763c763d1d799b11d8ded4365212e4b0b Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 17 Feb 2022 10:52:13 +0100
Subject: [PATCH] fix EPICS 3.13 munch rules for VxWorks 6

---
 App/tools/driver.makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index 6dc4dfa..9e115d6 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -1067,14 +1067,16 @@ endif
 MUNCH_5=tclsh $(VX_DIR)/host/src/hutils/munch.tcl
 MUNCH_6=tclsh $(VX_DIR)/host/resource/hutils/tcl/munch.tcl
 MUNCH_=$(MUNCH_5)
+MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
 # VXWORKS_MAJOR_VERSION exsists since EPICS 3.14.12 or so.
 MUNCH=$(MUNCH_$(VXWORKS_MAJOR_VERSION))
+MUNCH_LDFLAGS=$(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 %.munch: %
 	@echo Munching $<
 	$(RM) ctct$(OBJ) ctdt.c
 	$(NM) $< | $(MUNCH) > ctdt.c
-	$(COMPILE.c) -traditional ctdt.c
-	$(LINK.c) $@ $< ctdt$(OBJ)
+	$(COMPILE.c) -fdollars-in-identifiers ctdt.c
+	$(LD) $(MUNCH_LDFLAGS) -o $@ ctdt$(OBJ) $<
 
 %_ctdt.c : %.nm
 	@echo Munching $*