* grub-core/Makefile.am (kernel_syms.lst): Fix value and position of
ASM_PREFIX
---
ChangeLog.fix-ASM_PREFIX | 4 ++++
grub-core/Makefile.am | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
create mode 100644 ChangeLog.fix-ASM_PREFIX
diff --git a/ChangeLog.fix-ASM_PREFIX b/ChangeLog.fix-ASM_PREFIX
new file mode 100644
index 0000000..4979aca
--- /dev/null
+++ b/ChangeLog.fix-ASM_PREFIX
@@ -0,0 +1,4 @@
+ Fix generation of kernel_syms.lst (bad ASM_PREFIX)
+
+ * grub-core/Makefile.am (kernel_syms.lst): Fix value and position of
+ ASM_PREFIX
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 1b654ef..31a3522 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -175,7 +175,7 @@ CLEANFILES += symlist.c
BUILT_SOURCES += symlist.c
if COND_HAVE_ASM_USCORE
-ASM_PREFIX=1
+ASM_PREFIX=_
else
ASM_PREFIX=
endif
@@ -185,8 +185,8 @@ noinst_DATA += kernel_syms.lst
kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL)
$(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
cat kernel_syms.input | grep -v '^#' | sed -n \
- -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC
*(\([a-zA-Z0-9_]*\)).*/defined '"$(ASM_PREFIX)"'kernel \1/;p;}' \
- -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR
*(\([a-zA-Z0-9_]*\)).*/defined '"$(ASM_PREFIX)"' kernel \1/;p;}' \
+ -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC
*(\([a-zA-Z0-9_]*\)).*/defined kernel '"$(ASM_PREFIX)"'\1/;p;}' \
+ -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR
*(\([a-zA-Z0-9_]*\)).*/defined kernel '"$(ASM_PREFIX)"'\1/;p;}' \
| sort -u >$@
rm -f kernel_syms.input
CLEANFILES += kernel_syms.lst
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
