public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression
@ 2023-03-07 14:21 Richard Purdie
  2023-03-07 14:25 ` Simon Marchi
  0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2023-03-07 14:21 UTC (permalink / raw)
  To: gdb-patches; +Cc: Jose E . Marchesi, Simon Marchi

Commit 5218fa9e8937b007d554f1e01c2e4ecdb9b7e271, "gdb: use libtool in
GDB_AC_CHECK_BFD" dropped passing in existing LDFLAGS. In our environment,
this caused the configure check "checking for ELF support in BFD" to stop
working causing build failures as we need our LDFLAGS to be used for
correct linking.

That change also meant the code failed to match the comments. Add back the
missing LDFLAGS preservation, fix our builds and match the comment.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 gdb/acinclude.m4 | 2 +-
 gdb/configure    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 05106df8ee6..173e40b440a 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -234,7 +234,7 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
   # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
   # always want our bfd.
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty"
+  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
   LIBS="-lbfd -liberty $intl $LIBS"
   CC="./libtool --quiet --mode=link $CC"
diff --git a/gdb/configure b/gdb/configure
index 017ec05e4b7..18328fe5d42 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -28323,7 +28323,7 @@ fi
   # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
   # always want our bfd.
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty"
+  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
   LIBS="-lbfd -liberty $intl $LIBS"
   CC="./libtool --quiet --mode=link $CC"
-- 
2.38.1


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

* Re: [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression
  2023-03-07 14:21 [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression Richard Purdie
@ 2023-03-07 14:25 ` Simon Marchi
  2023-03-07 15:53   ` Jose E. Marchesi
  0 siblings, 1 reply; 4+ messages in thread
From: Simon Marchi @ 2023-03-07 14:25 UTC (permalink / raw)
  To: Richard Purdie, gdb-patches; +Cc: Jose E . Marchesi, Simon Marchi



On 3/7/23 09:21, Richard Purdie via Gdb-patches wrote:
> Commit 5218fa9e8937b007d554f1e01c2e4ecdb9b7e271, "gdb: use libtool in
> GDB_AC_CHECK_BFD" dropped passing in existing LDFLAGS. In our environment,
> this caused the configure check "checking for ELF support in BFD" to stop
> working causing build failures as we need our LDFLAGS to be used for
> correct linking.
> 
> That change also meant the code failed to match the comments. Add back the
> missing LDFLAGS preservation, fix our builds and match the comment.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  gdb/acinclude.m4 | 2 +-
>  gdb/configure    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
> index 05106df8ee6..173e40b440a 100644
> --- a/gdb/acinclude.m4
> +++ b/gdb/acinclude.m4
> @@ -234,7 +234,7 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>    # always want our bfd.
>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
> -  LDFLAGS="-L../bfd -L../libiberty"
> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>    LIBS="-lbfd -liberty $intl $LIBS"
>    CC="./libtool --quiet --mode=link $CC"
> diff --git a/gdb/configure b/gdb/configure
> index 017ec05e4b7..18328fe5d42 100755
> --- a/gdb/configure
> +++ b/gdb/configure
> @@ -28323,7 +28323,7 @@ fi
>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>    # always want our bfd.
>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
> -  LDFLAGS="-L../bfd -L../libiberty"
> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>    LIBS="-lbfd -liberty $intl $LIBS"
>    CC="./libtool --quiet --mode=link $CC"

This LGTM, but just to be sure, let's wait for Jose to confirm.

Simon

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

* Re: [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression
  2023-03-07 14:25 ` Simon Marchi
@ 2023-03-07 15:53   ` Jose E. Marchesi
  2023-03-07 16:14     ` Simon Marchi
  0 siblings, 1 reply; 4+ messages in thread
From: Jose E. Marchesi @ 2023-03-07 15:53 UTC (permalink / raw)
  To: Simon Marchi; +Cc: Richard Purdie, gdb-patches, Simon Marchi


> On 3/7/23 09:21, Richard Purdie via Gdb-patches wrote:
>> Commit 5218fa9e8937b007d554f1e01c2e4ecdb9b7e271, "gdb: use libtool in
>> GDB_AC_CHECK_BFD" dropped passing in existing LDFLAGS. In our environment,
>> this caused the configure check "checking for ELF support in BFD" to stop
>> working causing build failures as we need our LDFLAGS to be used for
>> correct linking.
>> 
>> That change also meant the code failed to match the comments. Add back the
>> missing LDFLAGS preservation, fix our builds and match the comment.
>> 
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>>  gdb/acinclude.m4 | 2 +-
>>  gdb/configure    | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
>> index 05106df8ee6..173e40b440a 100644
>> --- a/gdb/acinclude.m4
>> +++ b/gdb/acinclude.m4
>> @@ -234,7 +234,7 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
>>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>>    # always want our bfd.
>>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
>> -  LDFLAGS="-L../bfd -L../libiberty"
>> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>>    LIBS="-lbfd -liberty $intl $LIBS"
>>    CC="./libtool --quiet --mode=link $CC"
>> diff --git a/gdb/configure b/gdb/configure
>> index 017ec05e4b7..18328fe5d42 100755
>> --- a/gdb/configure
>> +++ b/gdb/configure
>> @@ -28323,7 +28323,7 @@ fi
>>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>>    # always want our bfd.
>>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
>> -  LDFLAGS="-L../bfd -L../libiberty"
>> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>>    LIBS="-lbfd -liberty $intl $LIBS"
>>    CC="./libtool --quiet --mode=link $CC"
>
> This LGTM, but just to be sure, let's wait for Jose to confirm.

LGTM as well.


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

* Re: [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression
  2023-03-07 15:53   ` Jose E. Marchesi
@ 2023-03-07 16:14     ` Simon Marchi
  0 siblings, 0 replies; 4+ messages in thread
From: Simon Marchi @ 2023-03-07 16:14 UTC (permalink / raw)
  To: Jose E. Marchesi; +Cc: Richard Purdie, gdb-patches, Simon Marchi



On 3/7/23 10:53, Jose E. Marchesi via Gdb-patches wrote:
> 
>> On 3/7/23 09:21, Richard Purdie via Gdb-patches wrote:
>>> Commit 5218fa9e8937b007d554f1e01c2e4ecdb9b7e271, "gdb: use libtool in
>>> GDB_AC_CHECK_BFD" dropped passing in existing LDFLAGS. In our environment,
>>> this caused the configure check "checking for ELF support in BFD" to stop
>>> working causing build failures as we need our LDFLAGS to be used for
>>> correct linking.
>>>
>>> That change also meant the code failed to match the comments. Add back the
>>> missing LDFLAGS preservation, fix our builds and match the comment.
>>>
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>>  gdb/acinclude.m4 | 2 +-
>>>  gdb/configure    | 2 +-
>>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
>>> index 05106df8ee6..173e40b440a 100644
>>> --- a/gdb/acinclude.m4
>>> +++ b/gdb/acinclude.m4
>>> @@ -234,7 +234,7 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
>>>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>>>    # always want our bfd.
>>>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
>>> -  LDFLAGS="-L../bfd -L../libiberty"
>>> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>>>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>>>    LIBS="-lbfd -liberty $intl $LIBS"
>>>    CC="./libtool --quiet --mode=link $CC"
>>> diff --git a/gdb/configure b/gdb/configure
>>> index 017ec05e4b7..18328fe5d42 100755
>>> --- a/gdb/configure
>>> +++ b/gdb/configure
>>> @@ -28323,7 +28323,7 @@ fi
>>>    # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
>>>    # always want our bfd.
>>>    CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
>>> -  LDFLAGS="-L../bfd -L../libiberty"
>>> +  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
>>>    intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
>>>    LIBS="-lbfd -liberty $intl $LIBS"
>>>    CC="./libtool --quiet --mode=link $CC"
>>
>> This LGTM, but just to be sure, let's wait for Jose to confirm.
> 
> LGTM as well.
> 

Thanks.  Running autoreconf, I see one more hunk in configure.  I
amended the patch and pushed it:


From 5fc6b6d44cd63651c2902cbfc5b9734a55aaa617 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 7 Mar 2023 14:21:50 +0000
Subject: [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression

Commit 5218fa9e8937b007d554f1e01c2e4ecdb9b7e271, "gdb: use libtool in
GDB_AC_CHECK_BFD" dropped passing in existing LDFLAGS. In our environment,
this caused the configure check "checking for ELF support in BFD" to stop
working causing build failures as we need our LDFLAGS to be used for
correct linking.

That change also meant the code failed to match the comments. Add back the
missing LDFLAGS preservation, fix our builds and match the comment.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Change-Id: Ie91509116fab29f95b9db1ff0b6ddc280d460112
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Reviewed-By: Jose E. Marchesi <jose.marchesi@oracle.com>
---
 gdb/acinclude.m4 | 2 +-
 gdb/configure    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 05106df8ee62..173e40b440af 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -234,7 +234,7 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
   # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
   # always want our bfd.
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty"
+  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
   LIBS="-lbfd -liberty $intl $LIBS"
   CC="./libtool --quiet --mode=link $CC"
diff --git a/gdb/configure b/gdb/configure
index 017ec05e4b71..5bb2a0795e59 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -28206,7 +28206,7 @@ WIN32LIBS="$WIN32LIBS $WIN32APILIBS"
   # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
   # always want our bfd.
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty"
+  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
   LIBS="-lbfd -liberty $intl $LIBS"
   CC="./libtool --quiet --mode=link $CC"
@@ -28323,7 +28323,7 @@ fi
   # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
   # always want our bfd.
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty"
+  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
   LIBS="-lbfd -liberty $intl $LIBS"
   CC="./libtool --quiet --mode=link $CC"

base-commit: 2eb2613519ae444493c301be1c37901c8a528c40
-- 
2.39.2



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

end of thread, other threads:[~2023-03-07 16:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-07 14:21 [PATCH] gdb: Fix GDB_AC_CHECK_BFD macro regression Richard Purdie
2023-03-07 14:25 ` Simon Marchi
2023-03-07 15:53   ` Jose E. Marchesi
2023-03-07 16:14     ` Simon Marchi

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).