re PR ada/68564 (Ada fails to bootstrap on sparc64-linux-gnu)

2015-11-28  Matthias Klose  <doko@ubuntu.com>

        PR ada/68564
        * gcc-interface/Makefile.in: Fix sparc/sparc64 bitness detection.

From-SVN: r231028

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 331b81dfba78e49cf86d3d65f28b25f647aff4ce..fe3f63e348f853b4b0f781d231d4f60750206a1d 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-28  Matthias Klose  <doko@ubuntu.com>
+
+       PR ada/68564
+       * gcc-interface/Makefile.in: Fix sparc/sparc64 bitness detection.
+
 2015-11-25  Arnaud Charlet  <charlet@adacore.com>
 
        * lib-xref-spark_specific.adb

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index d217a790e7be2232209a15d95eb4f8bb32612a51..d6a8c8f09dac55f09106dd4c31fd9200a70e6d3c 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2092,7 +2092,7 @@ ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS_64 = \
   system.ads<system-linux-sparcv9.ads
 
-  ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64)
+  ifneq (,$(or $(filter sparc64-linux-gnu, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multiarch)), $(filter ../lib64, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory))))
     LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
   else