[Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Stefan Weil]

Commit c261d774fb9093d00e0938a19f502fb220f62718 added one more binutils
tool: nm also needs a cross prefix.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 configure |    2 ++
 rules.mak |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1a9daa5..5eb95a3 100755
--- a/configure
+++ b/configure
@@ -389,6 +389,7 @@ cpp="${CPP-$cc -E}"
 objcopy="${OBJCOPY-${cross_prefix}objcopy}"
 ld="${LD-${cross_prefix}ld}"
 libtool="${LIBTOOL-${cross_prefix}libtool}"
+nm="${NM-${cross_prefix}nm}"
 strip="${STRIP-${cross_prefix}strip}"
 windres="${WINDRES-${cross_prefix}windres}"
 pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
@@ -4889,6 +4890,7 @@ echo "AS=$as" >> $config_host_mak
 echo "CPP=$cpp" >> $config_host_mak
 echo "OBJCOPY=$objcopy" >> $config_host_mak
 echo "LD=$ld" >> $config_host_mak
+echo "NM=$nm" >> $config_host_mak
 echo "WINDRES=$windres" >> $config_host_mak
 echo "LIBTOOL=$libtool" >> $config_host_mak
 echo "CFLAGS=$CFLAGS" >> $config_host_mak
diff --git a/rules.mak b/rules.mak
index 1d73293..cf76b88 100644
--- a/rules.mak
+++ b/rules.mak
@@ -23,7 +23,7 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
 QEMU_INCLUDES += -I$(<D) -I$(@D)
 
 WL_U := -Wl,-u,
-find-symbols = $(if $1, $(sort $(shell nm -P -g $1 | $2)))
+find-symbols = $(if $1, $(sort $(shell $(NM) -P -g $1 | $2)))
 defined-symbols = $(call find-symbols,$1,awk '$$2!="U"{print $$1}')
 undefined-symbols = $(call find-symbols,$1,awk '$$2=="U"{print $$1}')
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Peter Maydell]

On 18 September 2014 12:55, Stefan Weil <sw@weilnetz.de> wrote:
> Commit c261d774fb9093d00e0938a19f502fb220f62718 added one more binutils
> tool: nm also needs a cross prefix.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Heh, completely missed that when reviewing the original patch.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Re: [Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Paolo Bonzini]

Il 18/09/2014 22:07, Peter Maydell ha scritto:
> On 18 September 2014 12:55, Stefan Weil <sw@weilnetz.de> wrote:
>> Commit c261d774fb9093d00e0938a19f502fb220f62718 added one more binutils
>> tool: nm also needs a cross prefix.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> 
> Heh, completely missed that when reviewing the original patch.
> 
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Are you going to apply directly?

Paolo

Re: [Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Peter Maydell]

On 19 September 2014 06:27, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 18/09/2014 22:07, Peter Maydell ha scritto:
>> On 18 September 2014 12:55, Stefan Weil <sw@weilnetz.de> wrote:
>>> Commit c261d774fb9093d00e0938a19f502fb220f62718 added one more binutils
>>> tool: nm also needs a cross prefix.
>>>
>>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>
>> Heh, completely missed that when reviewing the original patch.
>>
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> Are you going to apply directly?

Yeah, sure.

-- PMM

Re: [Qemu-devel] [PATCH] Fix cross compilation (nm command)

[Peter Maydell]

On 18 September 2014 12:55, Stefan Weil <sw@weilnetz.de> wrote:
> Commit c261d774fb9093d00e0938a19f502fb220f62718 added one more binutils
> tool: nm also needs a cross prefix.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  configure |    2 ++
>  rules.mak |    2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)

Applied to master, thanks.

-- PMM