From: Yves Blusseau <blusseau@zetam.org>
Date: Mon, 27 Sep 2010 09:11:38 +0000 (+0200)
Subject:     Fix generation of kernel_syms.lst
X-Git-Tag: 1.99~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f772623bc030fb29e0dca57c7176284902fd50a4;p=thirdparty%2Fgrub.git

Fix generation of kernel_syms.lst

    * grub-core/Makefile.am (kernel_syms.lst): Fix value and position of
    ASM_PREFIX
---

diff --git a/ChangeLog b/ChangeLog
index 803cd3168..e428dcd53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-27  Yves Blusseau  <blusseau@zetam.org>
+
+	Fix generation of kernel_syms.lst
+
+	* grub-core/Makefile.am (kernel_syms.lst): Fix value and position of
+	ASM_PREFIX
+
 2010-09-26  Robert Millan  <rmh@gnu.org>
 
 	Support degraded ZFS arrays in "grub-probe -t device" resolution.
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index cff6b3782..0659d1c14 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -173,7 +173,7 @@ CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
 
 if COND_HAVE_ASM_USCORE
-ASM_PREFIX=1
+ASM_PREFIX=_
 else
 ASM_PREFIX=
 endif
@@ -183,8 +183,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