To adopt newer toolchains.
Signed-off-by: Jiaxun Yang <jiaxun.y...@flygoat.com>
---
scripts/gen-offsets.sh | 7 ++++---
src/gen-defs.h | 8 +++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/scripts/gen-offsets.sh b/scripts/gen-offsets.sh
index
73dede82b86da25cba0abbcf86039490c21e90cc..eeddca7f594a108a22439e5827ba09714a52b254
100755
--- a/scripts/gen-offsets.sh
+++ b/scripts/gen-offsets.sh
@@ -9,9 +9,10 @@ cat > "$OUTFILE" <<EOF
#ifndef __ASM_OFFSETS_H
#define __ASM_OFFSETS_H
EOF
-sed -ne "/^->/{s:->#\(.*\):/* \1 */:; \
- s:^->\([^ ]*\) [\$\#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
- s:->::; p;}" < "$INFILE" >> "$OUTFILE"
+sed -ne 's:^[[:space:]]*\.ascii[[:space:]]*"\(.*\)".*:\1:;
+ /^->/{s:->#\(.*\):/* \1 */:;
+ s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:;
+ s:->::; p;}' < "$INFILE" >> "$OUTFILE"
cat >> "$OUTFILE" <<EOF
#endif // asm-offsets.h
EOF
diff --git a/src/gen-defs.h b/src/gen-defs.h
index
dabf64cd9981f605845dd04edf7486a4fb4aa6c0..7cd80f6e248798e223bc18c71cf24041d6244cdd
100644
--- a/src/gen-defs.h
+++ b/src/gen-defs.h
@@ -3,17 +3,15 @@
#ifndef __GEN_DEFS_H
#define __GEN_DEFS_H
-
#define DEFINE(sym, val) \
- asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+ asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val))
-#define BLANK() \
- asm volatile("\n->" : : )
+#define BLANK() asm volatile("\n.ascii \"->\"" : : )
#define OFFSET(sym, str, mem) \
DEFINE(sym, offsetof(struct str, mem))
#define COMMENT(x) \
- asm volatile("\n->#" x)
+ asm volatile("\n.ascii \"->#" x "\"")
#endif // gen-defs.h
--
Git-154)
_______________________________________________
SeaBIOS mailing list -- seabios@seabios.org
To unsubscribe send an email to seabios-le...@seabios.org
