From 98a04ed1074a27af712e999cf98c09f03a8a5648 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Sun, 29 Mar 2015 15:48:50 +0000
Subject: [PATCH] Retire use of stripnulls
Now ObjAsm can ALIGN with arbitrary numbers, use the same trick FileCore does in its header by padding with newlines.
Not tagged.
---
Makefile | 1 -
s/makehswis | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f59af70..bdde7c8 100644
--- a/Makefile
+++ b/Makefile
@@ -645,7 +645,6 @@ lib.clib: ${CLIB_MOD_OBJS}
# Derived headers:
derived.swis: o.swis
${LD} -bin -o $@ o.SWIs
- stripnulls $@
settype $@ text
o.swis: s.makehswis h.swisheader s.swioptions
diff --git a/s/makehswis b/s/makehswis
index 921f633..d3dcf20 100644
--- a/s/makehswis
+++ b/s/makehswis
@@ -122,4 +122,7 @@ string2 SETS "&":CC:(:STR:value)
= 10
= "#endif", 10
+; Pad to word align with harmless newlines
+ ALIGN 4, 0, 10
+
END
--
GitLab