Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OzYqT-0004w1-Md for mharc-grub-devel@gnu.org; Sat, 25 Sep 2010 13:47:33 -0400 Received: from [140.186.70.92] (port=57524 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OzYqQ-0004uz-S8 for grub-devel@gnu.org; Sat, 25 Sep 2010 13:47:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OzYqP-0000fT-Cb for grub-devel@gnu.org; Sat, 25 Sep 2010 13:47:30 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:33616) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OzYqO-0000fI-PI for grub-devel@gnu.org; Sat, 25 Sep 2010 13:47:29 -0400 Received: from yves.private.network (unknown [88.175.100.234]) by smtp4-g21.free.fr (Postfix) with ESMTP id 16F2A4C8042 for ; Sat, 25 Sep 2010 19:47:22 +0200 (CEST) Received: from yves.private.network (localhost [127.0.0.1]) by yves.private.network (Postfix) with ESMTP id BA8C9986A11 for ; Sat, 25 Sep 2010 19:47:21 +0200 (CEST) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=MIMEBOUNDARY To: grub-devel@gnu.org From: Yves Blusseau Date: Sat, 25 Sep 2010 19:47:21 +0200 Message-ID: <20100925174721.80572.20199.stgit@yves.private.network> User-Agent: StGit/0.15-97-g9680 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Fix generation of kernel_syms.lst (bad ASM_PREFIX) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Sep 2010 17:47:32 -0000 This is a MIME message. --MIMEBOUNDARY Content-Disposition: inline MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit * 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 --MIMEBOUNDARY Content-Disposition: attachment; filename=fix-ASM_PREFIX.patch MIME-Version: 1.0 Content-Type: text/plain; name=fix-ASM_PREFIX.patch; charset="utf-8" Content-Transfer-Encoding: 7bit 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 --MIMEBOUNDARY--