public inbox for gcc-bugs@sourceware.org
help / color / mirror / Atom feed
* [Bug ada/104861] New: s-oscons.ads should use target_noncanonical
@ 2022-03-10  7:37 rguenth at gcc dot gnu.org
  2022-03-10  9:20 ` [Bug ada/104861] " ebotcazou at gcc dot gnu.org
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: rguenth at gcc dot gnu.org @ 2022-03-10  7:37 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

            Bug ID: 104861
           Summary: s-oscons.ads should use target_noncanonical
           Product: gcc
           Version: 12.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: ada
          Assignee: unassigned at gcc dot gnu.org
          Reporter: rguenth at gcc dot gnu.org
  Target Milestone: ---

It seems that gprbuild uses Target_Name to construct paths to find files of the
installed gnat but when you configure GCC with a non-canonical target name
like --target=x86_64-suse-linux (omitting -gnu) then make install will use
@target_noncanonical@ for the directory.  That causes the gprbuild tools to
fail to build.

A solution might be to do the following and base Target_Name on
@target_noncanonical@ instead.

diff --git a/gcc/ada/gcc-interface/Makefile.in
b/gcc/ada/gcc-interface/Makefile.in
index b8a24708280..1e9801a8b96 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -138,6 +138,7 @@ objdir = .

 target_alias=@target_alias@
 target=@target@
+target_noncanonical=@target_noncanonical@
 target_cpu=@target_cpu@
 target_vendor=@target_vendor@
 target_os=@target_os@
@@ -598,7 +599,7 @@ OSCONS_CC=$(subst ./xgcc,../../xgcc,$(subst -B./,
-B../../,$(GCC_FOR_TARGET)))
 # has a <types.h> header).

 OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -E -C \
-  -DTARGET=\"$(target)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c
> s-oscons-tmplt.i
+  -DTARGET=\"$(target_noncanonical)\" -iquote $(fsrcpfx)ada
$(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i
 OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -S s-oscons-tmplt.i

 # Note: if you need to build with a non-GNU compiler, you could adapt the

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
@ 2022-03-10  9:20 ` ebotcazou at gcc dot gnu.org
  2022-03-10  9:29 ` ebotcazou at gcc dot gnu.org
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ebotcazou at gcc dot gnu.org @ 2022-03-10  9:20 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bib_aab at hotmail dot com

--- Comment #1 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
*** Bug 104856 has been marked as a duplicate of this bug. ***

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
  2022-03-10  9:20 ` [Bug ada/104861] " ebotcazou at gcc dot gnu.org
@ 2022-03-10  9:29 ` ebotcazou at gcc dot gnu.org
  2022-03-10 10:36 ` rguenther at suse dot de
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ebotcazou at gcc dot gnu.org @ 2022-03-10  9:29 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
     Ever confirmed|0                           |1
   Last reconfirmed|                            |2022-03-10
             Status|UNCONFIRMED                 |NEW
                 CC|                            |charlet at gcc dot gnu.org,
                   |                            |ebotcazou at gcc dot gnu.org

--- Comment #2 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
Thanks for the investigation and the proposed patch.

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
  2022-03-10  9:20 ` [Bug ada/104861] " ebotcazou at gcc dot gnu.org
  2022-03-10  9:29 ` ebotcazou at gcc dot gnu.org
@ 2022-03-10 10:36 ` rguenther at suse dot de
  2022-03-10 10:39 ` charlet at gcc dot gnu.org
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: rguenther at suse dot de @ 2022-03-10 10:36 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

--- Comment #3 from rguenther at suse dot de <rguenther at suse dot de> ---
On Thu, 10 Mar 2022, ebotcazou at gcc dot gnu.org wrote:

> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861
> 
> Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:
> 
>            What    |Removed                     |Added
> ----------------------------------------------------------------------------
>      Ever confirmed|0                           |1
>    Last reconfirmed|                            |2022-03-10
>              Status|UNCONFIRMED                 |NEW
>                  CC|                            |charlet at gcc dot gnu.org,
>                    |                            |ebotcazou at gcc dot gnu.org
> 
> --- Comment #2 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
> Thanks for the investigation and the proposed patch.

Just as extra datapoint the patch makes s-oscons.ads consistent with
what gcc -dumpmachine says.

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (2 preceding siblings ...)
  2022-03-10 10:36 ` rguenther at suse dot de
@ 2022-03-10 10:39 ` charlet at gcc dot gnu.org
  2022-03-10 12:40 ` cvs-commit at gcc dot gnu.org
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: charlet at gcc dot gnu.org @ 2022-03-10 10:39 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

--- Comment #4 from Arnaud Charlet <charlet at gcc dot gnu.org> ---
Patch looks good to me, it's approved assuming clean testing, thanks!

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (3 preceding siblings ...)
  2022-03-10 10:39 ` charlet at gcc dot gnu.org
@ 2022-03-10 12:40 ` cvs-commit at gcc dot gnu.org
  2022-03-16  7:18 ` rguenth at gcc dot gnu.org
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: cvs-commit at gcc dot gnu.org @ 2022-03-10 12:40 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

--- Comment #5 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Richard Biener <rguenth@gcc.gnu.org>:

https://gcc.gnu.org/g:9467e7331188705ec16c086b77e1809c5b0aab7d

commit r12-7591-g9467e7331188705ec16c086b77e1809c5b0aab7d
Author: Richard Biener <rguenther@suse.de>
Date:   Thu Mar 10 13:35:46 2022 +0100

    ada/104861 - use target_noncanonial for Target_Name

    The following arranges for s-oscons.ads to record target_noncanonical
    for Target_Name, matching the install directory layout and what
    gcc -dumpmachine says.  This fixes build issues with gprbuild.

    2022-03-10  Richard Biener  <rguenther@suse.de>

            PR ada/104861
    gcc/ada/
            * gcc-interface/Makefile.in (target_noncanonical): Substitute.
            (OSCONS_CPP): Pass target_noncanonical as TARGET.

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (4 preceding siblings ...)
  2022-03-10 12:40 ` cvs-commit at gcc dot gnu.org
@ 2022-03-16  7:18 ` rguenth at gcc dot gnu.org
  2022-03-16  8:22 ` cvs-commit at gcc dot gnu.org
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: rguenth at gcc dot gnu.org @ 2022-03-16  7:18 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED
           Assignee|unassigned at gcc dot gnu.org      |rguenth at gcc dot gnu.org

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (5 preceding siblings ...)
  2022-03-16  7:18 ` rguenth at gcc dot gnu.org
@ 2022-03-16  8:22 ` cvs-commit at gcc dot gnu.org
  2022-04-21 12:51 ` cvs-commit at gcc dot gnu.org
  2022-04-21 12:58 ` rguenth at gcc dot gnu.org
  8 siblings, 0 replies; 10+ messages in thread
From: cvs-commit at gcc dot gnu.org @ 2022-03-16  8:22 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

--- Comment #6 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-11 branch has been updated by Richard Biener
<rguenth@gcc.gnu.org>:

https://gcc.gnu.org/g:6a1150d1524aeda3381b2171712e1a6611d441d6

commit r11-9662-g6a1150d1524aeda3381b2171712e1a6611d441d6
Author: Richard Biener <rguenther@suse.de>
Date:   Thu Mar 10 13:35:46 2022 +0100

    ada/104861 - use target_noncanonial for Target_Name

    The following arranges for s-oscons.ads to record target_noncanonical
    for Target_Name, matching the install directory layout and what
    gcc -dumpmachine says.  This fixes build issues with gprbuild.

    2022-03-10  Richard Biener  <rguenther@suse.de>

            PR ada/104861
    gcc/ada/
            * gcc-interface/Makefile.in (target_noncanonical): Substitute.
            (OSCONS_CPP): Pass target_noncanonical as TARGET.

    (cherry picked from commit 9467e7331188705ec16c086b77e1809c5b0aab7d)

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (6 preceding siblings ...)
  2022-03-16  8:22 ` cvs-commit at gcc dot gnu.org
@ 2022-04-21 12:51 ` cvs-commit at gcc dot gnu.org
  2022-04-21 12:58 ` rguenth at gcc dot gnu.org
  8 siblings, 0 replies; 10+ messages in thread
From: cvs-commit at gcc dot gnu.org @ 2022-04-21 12:51 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

--- Comment #7 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-10 branch has been updated by Richard Biener
<rguenth@gcc.gnu.org>:

https://gcc.gnu.org/g:eb077526a705da3f29db47824efefdcfc0072df2

commit r10-10544-geb077526a705da3f29db47824efefdcfc0072df2
Author: Richard Biener <rguenther@suse.de>
Date:   Thu Mar 10 13:35:46 2022 +0100

    ada/104861 - use target_noncanonial for Target_Name

    The following arranges for s-oscons.ads to record target_noncanonical
    for Target_Name, matching the install directory layout and what
    gcc -dumpmachine says.  This fixes build issues with gprbuild.

    2022-03-10  Richard Biener  <rguenther@suse.de>

            PR ada/104861
    gcc/ada/
            * gcc-interface/Makefile.in (target_noncanonical): Substitute.
            (OSCONS_CPP): Pass target_noncanonical as TARGET.

    (cherry picked from commit 9467e7331188705ec16c086b77e1809c5b0aab7d)

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

* [Bug ada/104861] s-oscons.ads should use target_noncanonical
  2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
                   ` (7 preceding siblings ...)
  2022-04-21 12:51 ` cvs-commit at gcc dot gnu.org
@ 2022-04-21 12:58 ` rguenth at gcc dot gnu.org
  8 siblings, 0 replies; 10+ messages in thread
From: rguenth at gcc dot gnu.org @ 2022-04-21 12:58 UTC (permalink / raw)
  To: gcc-bugs

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104861

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|ASSIGNED                    |RESOLVED

--- Comment #8 from Richard Biener <rguenth at gcc dot gnu.org> ---
Fixed as far as I plan backporting.

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

end of thread, other threads:[~2022-04-21 12:58 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-10  7:37 [Bug ada/104861] New: s-oscons.ads should use target_noncanonical rguenth at gcc dot gnu.org
2022-03-10  9:20 ` [Bug ada/104861] " ebotcazou at gcc dot gnu.org
2022-03-10  9:29 ` ebotcazou at gcc dot gnu.org
2022-03-10 10:36 ` rguenther at suse dot de
2022-03-10 10:39 ` charlet at gcc dot gnu.org
2022-03-10 12:40 ` cvs-commit at gcc dot gnu.org
2022-03-16  7:18 ` rguenth at gcc dot gnu.org
2022-03-16  8:22 ` cvs-commit at gcc dot gnu.org
2022-04-21 12:51 ` cvs-commit at gcc dot gnu.org
2022-04-21 12:58 ` rguenth at gcc dot gnu.org

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