[gcc r11-9662] ada/104861 - use target_noncanonial for Target_Name

[Richard Biener]

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)

Diff:
---
 gcc/ada/gcc-interface/Makefile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 74a21122fb6..6cc95038c40 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@
@@ -595,7 +596,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