public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
@ 2021-07-07 15:55 Ludovic Courtès
  2021-07-07 16:06 ` Florian Weimer
  0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2021-07-07 15:55 UTC (permalink / raw)
  To: libc-alpha; +Cc: Ludovic Courtès

When cross-compiling to powerpc64le-linux-gnu,
sysdeps/powerpc/powerpc64/le/Makefile would use "objcopy", leading to
errors like:

  objcopy: Unable to recognise the format of the input file `…/no_ldbl_gnu_attribute.o'

This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
'$CC -print-prog-name=objcopy' to determine the value of the OBJCOPY
variable.  That way, OBJCOPY is set to TRIPLET-objcopy when
cross-compiling for TRIPLET.
---
 aclocal.m4   |  2 --
 configure    | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac |  1 +
 3 files changed, 94 insertions(+), 5 deletions(-)

The issue was initially reported at:

  https://issues.guix.gnu.org/49417

It is a followup to a similar patch I sent regarding objdump:

  https://sourceware.org/pipermail/libc-alpha/2021-July/128333.html

Thanks,
Ludo’.

diff --git a/aclocal.m4 b/aclocal.m4
index 13a791ffde..5b370c07a2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -118,8 +118,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 AC_SUBST(AR)
-OBJCOPY=`$CC -print-prog-name=objcopy`
-AC_SUBST(OBJCOPY)
 GPROF=`$CC -print-prog-name=gprof`
 AC_SUBST(GPROF)
 
diff --git a/configure b/configure
index fe0eda1cd5..3a08270734 100755
--- a/configure
+++ b/configure
@@ -654,7 +654,6 @@ MAKE
 LD
 AS
 GPROF
-OBJCOPY
 AR
 LN_S
 INSTALL_DATA
@@ -689,6 +688,7 @@ sysheaders
 ac_ct_CXX
 CXXFLAGS
 CXX
+OBJCOPY
 OBJDUMP
 READELF
 CPP
@@ -3054,6 +3054,98 @@ else
   OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objcopy; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJCOPY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJCOPY"; then
+  ac_ct_OBJCOPY=$OBJCOPY
+  # Extract the first word of "objcopy", so it can be a program name with args.
+set dummy objcopy; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJCOPY"; then
+  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJCOPY="objcopy"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
+if test -n "$ac_ct_OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
+$as_echo "$ac_ct_OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJCOPY" = x; then
+    OBJCOPY="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJCOPY=$ac_ct_OBJCOPY
+  fi
+else
+  OBJCOPY="$ac_cv_prog_OBJCOPY"
+fi
+
 
 # We need the C++ compiler only for testing.
 ac_ext=cpp
@@ -4645,8 +4737,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 
-OBJCOPY=`$CC -print-prog-name=objcopy`
-
 GPROF=`$CC -print-prog-name=gprof`
 
 
diff --git a/configure.ac b/configure.ac
index 924af12738..2148cd2ec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AC_SUBST(cross_compiling)
 AC_PROG_CPP
 AC_CHECK_TOOL(READELF, readelf, false)
 AC_CHECK_TOOL(OBJDUMP, objdump, false)
+AC_CHECK_TOOL(OBJCOPY, objcopy, false)
 
 # We need the C++ compiler only for testing.
 AC_PROG_CXX
-- 
2.32.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
  2021-07-07 15:55 [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling Ludovic Courtès
@ 2021-07-07 16:06 ` Florian Weimer
  2021-07-07 22:05   ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2021-07-07 16:06 UTC (permalink / raw)
  To: Ludovic Courtès via Libc-alpha; +Cc: Ludovic Courtès

* Ludovic Courtès via Libc-alpha:

> When cross-compiling to powerpc64le-linux-gnu,
> sysdeps/powerpc/powerpc64/le/Makefile would use "objcopy", leading to
> errors like:
>
>   objcopy: Unable to recognise the format of the input file `…/no_ldbl_gnu_attribute.o'
>
> This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
> '$CC -print-prog-name=objcopy' to determine the value of the OBJCOPY
> variable.  That way, OBJCOPY is set to TRIPLET-objcopy when
> cross-compiling for TRIPLET.

Hmm.  Why doesn't '$CC -print-prog-name=objcopy' result in the right
command name?

Thanks,
Florian


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
  2021-07-07 16:06 ` Florian Weimer
@ 2021-07-07 22:05   ` Ludovic Courtès
  2021-07-08  0:07     ` H.J. Lu
  2021-07-08 16:49     ` Joseph Myers
  0 siblings, 2 replies; 6+ messages in thread
From: Ludovic Courtès @ 2021-07-07 22:05 UTC (permalink / raw)
  To: Florian Weimer; +Cc: Ludovic Courtès via Libc-alpha

Hi,

Florian Weimer <fweimer@redhat.com> skribis:

> * Ludovic Courtès via Libc-alpha:
>
>> When cross-compiling to powerpc64le-linux-gnu,
>> sysdeps/powerpc/powerpc64/le/Makefile would use "objcopy", leading to
>> errors like:
>>
>>   objcopy: Unable to recognise the format of the input file `…/no_ldbl_gnu_attribute.o'
>>
>> This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
>> '$CC -print-prog-name=objcopy' to determine the value of the OBJCOPY
>> variable.  That way, OBJCOPY is set to TRIPLET-objcopy when
>> cross-compiling for TRIPLET.
>
> Hmm.  Why doesn't '$CC -print-prog-name=objcopy' result in the right
> command name?

Is it supposed to?  Looking at gcc/gcc.c:find_a_file, I’m not sure.
For me it prints ‘objcopy’, and when I run:

  strace aarch64-linux-gnu-gcc -print-prog-name=objcopy

… I only see it look for ‘objcopy’, not ‘aarch64-linux-gnu-objcopy’.

Could it be a packaging issue?

Thanks,
Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
  2021-07-07 22:05   ` Ludovic Courtès
@ 2021-07-08  0:07     ` H.J. Lu
  2021-07-08 16:49     ` Joseph Myers
  1 sibling, 0 replies; 6+ messages in thread
From: H.J. Lu @ 2021-07-08  0:07 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Florian Weimer, Ludovic Courtès via Libc-alpha

On Wed, Jul 7, 2021 at 3:06 PM Ludovic Courtès via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Hi,
>
> Florian Weimer <fweimer@redhat.com> skribis:
>
> > * Ludovic Courtès via Libc-alpha:
> >
> >> When cross-compiling to powerpc64le-linux-gnu,
> >> sysdeps/powerpc/powerpc64/le/Makefile would use "objcopy", leading to
> >> errors like:
> >>
> >>   objcopy: Unable to recognise the format of the input file `…/no_ldbl_gnu_attribute.o'
> >>
> >> This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
> >> '$CC -print-prog-name=objcopy' to determine the value of the OBJCOPY
> >> variable.  That way, OBJCOPY is set to TRIPLET-objcopy when
> >> cross-compiling for TRIPLET.
> >
> > Hmm.  Why doesn't '$CC -print-prog-name=objcopy' result in the right
> > command name?
>
> Is it supposed to?  Looking at gcc/gcc.c:find_a_file, I’m not sure.
> For me it prints ‘objcopy’, and when I run:
>
>   strace aarch64-linux-gnu-gcc -print-prog-name=objcopy
>
> … I only see it look for ‘objcopy’, not ‘aarch64-linux-gnu-objcopy’.
>
> Could it be a packaging issue?

Your cross compiler isn't built properly.   Glibc scripts/build-many-glibcs.py
can build proper cross compilers.

-- 
H.J.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
  2021-07-07 22:05   ` Ludovic Courtès
  2021-07-08  0:07     ` H.J. Lu
@ 2021-07-08 16:49     ` Joseph Myers
  2021-07-09 14:02       ` Ludovic Courtès
  1 sibling, 1 reply; 6+ messages in thread
From: Joseph Myers @ 2021-07-08 16:49 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Florian Weimer, Ludovic Courtès via Libc-alpha

On Thu, 8 Jul 2021, Ludovic Courtès via Libc-alpha wrote:

> > Hmm.  Why doesn't '$CC -print-prog-name=objcopy' result in the right
> > command name?
> 
> Is it supposed to?  Looking at gcc/gcc.c:find_a_file, I’m not sure.
> For me it prints ‘objcopy’, and when I run:
> 
>   strace aarch64-linux-gnu-gcc -print-prog-name=objcopy
> 
> … I only see it look for ‘objcopy’, not ‘aarch64-linux-gnu-objcopy’.

I'd expect it to look for objcopy in $exec_prefix/$target/bin (binutils 
installs it as objcopy in that directory and as $target-objcopy in 
$exec_prefix/bin, see TOOL_PROGS in binutils/Makefile.am).  (That path may 
well in turn be computed via GCC's libexecsubdir, I see output such as 
/scratch/jmyers/glibc-bot/install/compilers/aarch64-linux-gnu/lib/gcc/aarch64-glibc-linux-gnu/12.0.0/../../../../aarch64-glibc-linux-gnu/bin/objcopy.)

I'd expect the code to work both before and after the patch.  If there is 
some advantage to the change proposed in the patch, it would be a good 
idea for the commit message to explain in more detail the circumstances 
when the objcopy in $exec_prefix/$target/bin isn't found.

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling.
  2021-07-08 16:49     ` Joseph Myers
@ 2021-07-09 14:02       ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2021-07-09 14:02 UTC (permalink / raw)
  To: Joseph Myers; +Cc: Florian Weimer, Ludovic Courtès via Libc-alpha

[-- Attachment #1: Type: text/plain, Size: 5097 bytes --]

Hi Joseph,

Joseph Myers <joseph@codesourcery.com> skribis:

> On Thu, 8 Jul 2021, Ludovic Courtès via Libc-alpha wrote:
>
>> > Hmm.  Why doesn't '$CC -print-prog-name=objcopy' result in the right
>> > command name?
>> 
>> Is it supposed to?  Looking at gcc/gcc.c:find_a_file, I’m not sure.
>> For me it prints ‘objcopy’, and when I run:
>> 
>>   strace aarch64-linux-gnu-gcc -print-prog-name=objcopy
>> 
>> … I only see it look for ‘objcopy’, not ‘aarch64-linux-gnu-objcopy’.
>
> I'd expect it to look for objcopy in $exec_prefix/$target/bin (binutils 
> installs it as objcopy in that directory and as $target-objcopy in 
> $exec_prefix/bin, see TOOL_PROGS in binutils/Makefile.am).  (That path may 
> well in turn be computed via GCC's libexecsubdir, I see output such as 
> /scratch/jmyers/glibc-bot/install/compilers/aarch64-linux-gnu/lib/gcc/aarch64-glibc-linux-gnu/12.0.0/../../../../aarch64-glibc-linux-gnu/bin/objcopy.)

Oh, got it.  That only works when GCC and Binutils are installed in the
same prefix, then.

In Guix, each package is installed in its own prefix.  The cross
Binutils has $exec_prefix/$target/bin as you write:

--8<---------------cut here---------------start------------->8---
$ find /gnu/store/aj1zbw51fvngxrl1r2g6xcxfnlkshr82-binutils-cross-aarch64-linux-gnu-2.34/ -name objdump
/gnu/store/aj1zbw51fvngxrl1r2g6xcxfnlkshr82-binutils-cross-aarch64-linux-gnu-2.34/aarch64-linux-gnu/bin/objdump
--8<---------------cut here---------------end--------------->8---

… but GCC is instead looking for it in its own prefix:

--8<---------------cut here---------------start------------->8---
$ strace -e stat aarch64-linux-gnu-gcc -print-prog-name=objdump
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/tls/haswell/x86_64", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/tls/haswell", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/tls/x86_64", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/tls", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/haswell/x86_64", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/haswell", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib/x86_64", 0x7ffc8fcfb630) = -1 ENOENT (No such file or directory)
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/bin/aarch64-linux-gnu-gcc", {st_mode=S_IFREG|0555, st_size=997752, ...}) = 0
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/bin/aarch64-linux-gnu-gcc", {st_mode=S_IFREG|0555, st_size=997752, ...}) = 0
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/libexec/gcc/aarch64-linux-gnu/7.5.0/lto-wrapper", {st_mode=S_IFREG|0555, st_size=909104, ...}) = 0
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/libexec/gcc/aarch64-linux-gnu/7.5.0/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/libexec/gcc/aarch64-linux-gnu/7.5.0/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/1m16gz0q4v4j10k52i5q641sz6lvdwha-gcc-cross-aarch64-linux-gnu-7.5.0/libexec/gcc/aarch64-linux-gnu/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/029zph27cyn3wvbxmlqh2xqrnk3h3323-gcc-cross-aarch64-linux-gnu-7.5.0-lib/lib/gcc/aarch64-linux-gnu/7.5.0/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/029zph27cyn3wvbxmlqh2xqrnk3h3323-gcc-cross-aarch64-linux-gnu-7.5.0-lib/lib/gcc/aarch64-linux-gnu/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/029zph27cyn3wvbxmlqh2xqrnk3h3323-gcc-cross-aarch64-linux-gnu-7.5.0-lib/lib/gcc/aarch64-linux-gnu/7.5.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/7.5.0/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
stat("/gnu/store/029zph27cyn3wvbxmlqh2xqrnk3h3323-gcc-cross-aarch64-linux-gnu-7.5.0-lib/lib/gcc/aarch64-linux-gnu/7.5.0/../../../../aarch64-linux-gnu/bin/objdump", 0x7ffc8fcfc110) = -1 ENOENT (No such file or directory)
objdump
+++ exited with 0 +++
--8<---------------cut here---------------end--------------->8---

… which fails.

> I'd expect the code to work both before and after the patch.  If there is 
> some advantage to the change proposed in the patch, it would be a good 
> idea for the commit message to explain in more detail the circumstances 
> when the objcopy in $exec_prefix/$target/bin isn't found.

I reworded the commit log of the two patches (attached).

Let me know what you think.

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: objdump --]
[-- Type: text/x-patch, Size: 5487 bytes --]

From 384fe532838b997a8a56c990b41b860ce79a2fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 1 Jul 2021 22:38:48 +0200
Subject: [PATCH 1/2] Use 'AC_CHECK_TOOL' rather than '$CC
 -print-prog-name=objdump'.

Commit 87d583c6e8cd0e49f64da76636ebeec033298b4d replaces the sed script
with an "objdump -f" invocation to determine the 'OUTPUT_FORMAT' bit of
the libc.so linker script.

On non-FHS distros such as GNU Guix, Binutils and GCC are installed in
different prefixes.  Consequently:

  powerpc64le-linux-gnu-gcc -print-prog-name=objdump

fails to find $binutils_prefix/$target_alias/bin/objdump and returns
'objdump'.  When cross-compiling, for example from x86_64-linux-gnu to
aarch64-linux-gnu, "objdump -f" would report the wrong
format ("elf64-little").  Conversely, "aarch64-linux-gnu-objdump -f"
reports "elf64-littleaarch64" as expected.

This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
'$CC -print-prog-name=objdump' to determine the value of the OBJDUMP
variable.  That way, OBJDUMP is set to TRIPLET-objdump when
cross-compiling for TRIPLET, which is safer.
---
 aclocal.m4   |  2 --
 configure    | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac |  1 +
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index c195c4db56..13a791ffde 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -118,8 +118,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 AC_SUBST(AR)
-OBJDUMP=`$CC -print-prog-name=objdump`
-AC_SUBST(OBJDUMP)
 OBJCOPY=`$CC -print-prog-name=objcopy`
 AC_SUBST(OBJCOPY)
 GPROF=`$CC -print-prog-name=gprof`
diff --git a/configure b/configure
index 9619c10991..fe0eda1cd5 100755
--- a/configure
+++ b/configure
@@ -655,7 +655,6 @@ LD
 AS
 GPROF
 OBJCOPY
-OBJDUMP
 AR
 LN_S
 INSTALL_DATA
@@ -690,6 +689,7 @@ sysheaders
 ac_ct_CXX
 CXXFLAGS
 CXX
+OBJDUMP
 READELF
 CPP
 cross_compiling
@@ -2962,6 +2962,98 @@ else
   READELF="$ac_cv_prog_READELF"
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
 
 # We need the C++ compiler only for testing.
 ac_ext=cpp
@@ -4553,8 +4645,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 
-OBJDUMP=`$CC -print-prog-name=objdump`
-
 OBJCOPY=`$CC -print-prog-name=objcopy`
 
 GPROF=`$CC -print-prog-name=gprof`
diff --git a/configure.ac b/configure.ac
index 34ecbba540..924af12738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ fi
 AC_SUBST(cross_compiling)
 AC_PROG_CPP
 AC_CHECK_TOOL(READELF, readelf, false)
+AC_CHECK_TOOL(OBJDUMP, objdump, false)
 
 # We need the C++ compiler only for testing.
 AC_PROG_CXX

base-commit: eb68d7d23cc411acdf68a60f194343a6774d6194
-- 
2.32.0


[-- Attachment #3: objcopy --]
[-- Type: text/x-patch, Size: 5488 bytes --]

From 2f48a46ac84396205df23686661c9c36c04a4a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 7 Jul 2021 17:48:04 +0200
Subject: [PATCH 2/2] Use 'AC_CHECK_TOOL' rather than '$CC
 -print-prog-name=objcopy'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On non-FHS distros such as GNU Guix, Binutils and GCC are installed in
different prefixes.  Consequently:

  powerpc64le-linux-gnu-gcc -print-prog-name=objcopy

fails to find $binutils_prefix/$target_alias/bin/objcopy and returns
'objcopy'.  In turn, when cross-compiling to powerpc64le-linux-gnu,
sysdeps/powerpc/powerpc64/le/Makefile would use "objcopy", leading to
errors like:

  objcopy: Unable to recognise the format of the input file `…/no_ldbl_gnu_attribute.o'

This patch changes 'configure.ac' to use AC_CHECK_TOOL rather than
'$CC -print-prog-name=objcopy' to determine the value of the OBJCOPY
variable.  That way, OBJCOPY is set to TRIPLET-objcopy when
cross-compiling for TRIPLET, which is safer.
---
 aclocal.m4   |  2 --
 configure    | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac |  1 +
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 13a791ffde..5b370c07a2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -118,8 +118,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 AC_SUBST(AR)
-OBJCOPY=`$CC -print-prog-name=objcopy`
-AC_SUBST(OBJCOPY)
 GPROF=`$CC -print-prog-name=gprof`
 AC_SUBST(GPROF)
 
diff --git a/configure b/configure
index fe0eda1cd5..3a08270734 100755
--- a/configure
+++ b/configure
@@ -654,7 +654,6 @@ MAKE
 LD
 AS
 GPROF
-OBJCOPY
 AR
 LN_S
 INSTALL_DATA
@@ -689,6 +688,7 @@ sysheaders
 ac_ct_CXX
 CXXFLAGS
 CXX
+OBJCOPY
 OBJDUMP
 READELF
 CPP
@@ -3054,6 +3054,98 @@ else
   OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objcopy; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJCOPY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJCOPY"; then
+  ac_ct_OBJCOPY=$OBJCOPY
+  # Extract the first word of "objcopy", so it can be a program name with args.
+set dummy objcopy; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJCOPY"; then
+  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJCOPY="objcopy"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
+if test -n "$ac_ct_OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
+$as_echo "$ac_ct_OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJCOPY" = x; then
+    OBJCOPY="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJCOPY=$ac_ct_OBJCOPY
+  fi
+else
+  OBJCOPY="$ac_cv_prog_OBJCOPY"
+fi
+
 
 # We need the C++ compiler only for testing.
 ac_ext=cpp
@@ -4645,8 +4737,6 @@ AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 
-OBJCOPY=`$CC -print-prog-name=objcopy`
-
 GPROF=`$CC -print-prog-name=gprof`
 
 
diff --git a/configure.ac b/configure.ac
index 924af12738..2148cd2ec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AC_SUBST(cross_compiling)
 AC_PROG_CPP
 AC_CHECK_TOOL(READELF, readelf, false)
 AC_CHECK_TOOL(OBJDUMP, objdump, false)
+AC_CHECK_TOOL(OBJCOPY, objcopy, false)
 
 # We need the C++ compiler only for testing.
 AC_PROG_CXX
-- 
2.32.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-09 14:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-07 15:55 [PATCH powerpc64le] Use the target 'objcopy' when cross-compiling Ludovic Courtès
2021-07-07 16:06 ` Florian Weimer
2021-07-07 22:05   ` Ludovic Courtès
2021-07-08  0:07     ` H.J. Lu
2021-07-08 16:49     ` Joseph Myers
2021-07-09 14:02       ` Ludovic Courtès

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).