From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W4Yjv-0005iU-Gw for mharc-grub-devel@gnu.org; Sat, 18 Jan 2014 11:27:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4Yjp-0005hg-3G for grub-devel@gnu.org; Sat, 18 Jan 2014 11:27:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4Yjk-0004Fh-G8 for grub-devel@gnu.org; Sat, 18 Jan 2014 11:27:13 -0500 Received: from mail-lb0-x235.google.com ([2a00:1450:4010:c04::235]:40407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4Yjk-0004Fd-7Z for grub-devel@gnu.org; Sat, 18 Jan 2014 11:27:08 -0500 Received: by mail-lb0-f181.google.com with SMTP id z5so3764802lbh.40 for ; Sat, 18 Jan 2014 08:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=jV36Qo2/0a4g2jROwH9mRquNtN2IiWu8Syv1w9MlUhQ=; b=p8erEJnnp2EdEqB9r28xFaZxhsbhrhGHuO5GzuraU9s4DSHccYuBm7gxED4QrYPYpx np/crr90jEXoUBK95gm93YyfS4cfmnUHjknrsG4xtM4r0VDLBkyg+y5qzPkkaJ6y0S49 yj+wxRhhsV05WA1H6Owl0F6evVstwvDR3M2pU9pmOlmOIWXYwLpNycPApe+BHOIWXj4k k65Y8DhODAp2tnHKmbAcIVwrEYyX+3JaXeIbuMHilbPPq4mHL1y9Q+TwJE7C4T6YUWDE tyFzzxIMfVARFT3yjej+gxq52VWinyLc/KDfG9GTS2bBsq3GDliO3RfpXWTujffKpKzY /1Vg== X-Received: by 10.152.23.3 with SMTP id i3mr38619laf.78.1390062427108; Sat, 18 Jan 2014 08:27:07 -0800 (PST) Received: from localhost.localdomain (ppp91-76-163-241.pppoe.mtu-net.ru. [91.76.163.241]) by mx.google.com with ESMTPSA id g8sm7970466lae.1.2014.01.18.08.27.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jan 2014 08:27:06 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] use MODULE_FILES for genemuinit* instead of MOD_FILES Date: Sat, 18 Jan 2014 20:27:02 +0400 Message-Id: <1390062422-18563-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::235 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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, 18 Jan 2014 16:27:17 -0000 MinGW native nm does not support ELF binaries. While on it, pass detected nm arguments instead of hardcoding them. --- grub-core/Makefile.am | 6 +++--- grub-core/genemuinit.sh | 9 +++++---- grub-core/genemuinitheader.sh | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 13b7979..704ae90 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -292,12 +292,12 @@ grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h -grub_emu_init.h: genemuinitheader.sh $(MOD_FILES) - rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) > $@ +grub_emu_init.h: genemuinitheader.sh $(MODULE_FILES) + rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) $(TARGET_NMFLAGS_MINUS_P) $(TARGET_NMFLAGS_DEFINED_ONLY) > $@ CLEANFILES += grub_emu_init.h grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES) - rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@ + rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) $(TARGET_NMFLAGS_MINUS_P) $(TARGET_NMFLAGS_DEFINED_ONLY) > $@ CLEANFILES += grub_emu_init.c endif diff --git a/grub-core/genemuinit.sh b/grub-core/genemuinit.sh index 45c15ec..58fb604 100644 --- a/grub-core/genemuinit.sh +++ b/grub-core/genemuinit.sh @@ -13,6 +13,7 @@ nm="$1" shift +nmargs="$*" cat < /dev/null; then - echo "grub_${line}_init ();" | sed 's,\.mod,,g;' + if ${nm} ${nmargs} -p ${line} | grep grub_mod_init > /dev/null; then + echo "grub_${line%%.*}_init ();" fi done @@ -62,8 +63,8 @@ grub_fini_all (void) EOF for line in $mods; do - if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then - echo "grub_${line}_fini ();" | sed 's,\.mod,,g;' + if ${nm} ${nmargs} -p ${line} | grep grub_mod_fini > /dev/null; then + echo "grub_${line%%.*}_fini ();" fi done diff --git a/grub-core/genemuinitheader.sh b/grub-core/genemuinitheader.sh index 6b83f59..8631157 100644 --- a/grub-core/genemuinitheader.sh +++ b/grub-core/genemuinitheader.sh @@ -13,6 +13,7 @@ nm="$1" shift +nmargs="$*" cat < /dev/null; then - echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;' + if ${nm} ${nmargs} -p ${line} | grep grub_mod_init > /dev/null; then + echo "void grub_${line%%.*}_init (void);" fi - if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then - echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;' + if ${nm} ${nmargs} -p ${line} | grep grub_mod_fini > /dev/null; then + echo "void grub_${line%%.*}_fini (void);" fi done -- tg: (5ef569d..) u/mingw/use_MODULE_FILES_for_genemu (depends on: master)