]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR ada/68564 (Ada fails to bootstrap on sparc64-linux-gnu)
authorMatthias Klose <doko@ubuntu.com>
Sat, 28 Nov 2015 02:42:37 +0000 (02:42 +0000)
committerMatthias Klose <doko@gcc.gnu.org>
Sat, 28 Nov 2015 02:42:37 +0000 (02:42 +0000)
2015-11-28  Matthias Klose  <doko@ubuntu.com>

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

From-SVN: r231030

gcc/ada/ChangeLog
gcc/ada/gcc-interface/Makefile.in

index 374a2a271468c39dbb73a837b3b308c8a0e78f72..8f034e9b142392aafaa74ba1808da0ae87e46a9b 100644 (file)
@@ -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-10-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/Make-lang.in: Make sure that GNAT1_OBJS and not just
index e2cc4a9e0ecebfe0a1e4747dcaa541affa3e24bc..c1fc21ddf1ab1d75556fe6e4742b0ba213d02d09 100644 (file)
@@ -2048,7 +2048,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