diff options
author | Matthias Klose <doko@ubuntu.com> | 2015-11-28 02:39:20 +0000 |
---|---|---|
committer | Matthias Klose <doko@gcc.gnu.org> | 2015-11-28 02:39:20 +0000 |
commit | c14826cfc95af9589152cc92a63b58080227497d (patch) | |
tree | f98fc69e4ceb330ce43699af56a08a5b4f460015 /gcc | |
parent | 09a49a482cd4c83b963b4b681f32ea611afe967d (diff) | |
download | gcc-c14826cfc95af9589152cc92a63b58080227497d.zip gcc-c14826cfc95af9589152cc92a63b58080227497d.tar.gz gcc-c14826cfc95af9589152cc92a63b58080227497d.tar.bz2 |
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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 331b81d..fe3f63e 100644 --- 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 d217a79..d6a8c8f 100644 --- 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 |