diff options
| author | Matthias Klose <doko@ubuntu.com> | 2015-11-29 22:41:00 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2015-11-29 22:41:00 +0000 |
| commit | 597432ed1691469efa474f82f9bc82b9255c22f4 (patch) | |
| tree | 348295d563ce182716dea10aa2e33afd7b972b67 | |
| parent | f1703a2e2b3fefa60a70e08f30be5fb4a7fd8b4f (diff) | |
| download | gcc-597432ed1691469efa474f82f9bc82b9255c22f4.zip gcc-597432ed1691469efa474f82f9bc82b9255c22f4.tar.gz gcc-597432ed1691469efa474f82f9bc82b9255c22f4.tar.bz2 | |
re PR ada/68564 (Ada fails to bootstrap on sparc64-linux-gnu)
2015-11-29 Matthias Klose <doko@ubuntu.com>
PR ada/68564
* gcc-interface/Makefile.in: Fix powerpc/powerpc64* and
mipsel/mips64el bitness detection.
Merge the mipsel/mips64el definitions into one.
From-SVN: r231051
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 51 |
2 files changed, 11 insertions, 47 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fe3f63e..d8196f4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2015-11-29 Matthias Klose <doko@ubuntu.com> + + PR ada/68564 + * gcc-interface/Makefile.in: Fix powerpc/powerpc64* and + mipsel/mips64el bitness detection. + Merge the mipsel/mips64el definitions into one. + 2015-11-28 Matthias Klose <doko@ubuntu.com> PR ada/68564 diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index d6a8c8f..bed93b9 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1841,8 +1841,8 @@ ifeq ($(strip $(filter-out mips linux%,$(target_cpu) $(target_os))),) LIBRARY_VERSION := $(LIB_VERSION) endif -# Mips/el Linux -ifeq ($(strip $(filter-out mipsel linux%,$(target_cpu) $(target_os))),) +# Mips/el and Mips64/el Linux +ifeq ($(strip $(filter-out mipsel mips64el linux%,$(target_cpu) $(target_os))),) LIBGNAT_TARGET_PAIRS_COMMON = \ a-intnam.ads<a-intnam-linux.ads \ s-inmaop.adb<s-inmaop-posix.adb \ @@ -1864,50 +1864,7 @@ ifeq ($(strip $(filter-out mipsel linux%,$(target_cpu) $(target_os))),) LIBGNAT_TARGET_PAIRS_64 = \ system.ads<system-linux-mips64el.ads - ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64) - LIBGNAT_TARGET_PAIRS = \ - $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64) - else - LIBGNAT_TARGET_PAIRS = \ - $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32) - endif - - TOOLS_TARGET_PAIRS = \ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb - - EXTRA_GNATRTL_TASKING_OBJS=s-linux.o - EH_MECHANISM=-gcc - THREADSLIB = -lpthread - GNATLIB_SHARED = gnatlib-shared-dual - GMEM_LIB = gmemlib - LIBRARY_VERSION := $(LIB_VERSION) -endif - -# Mips64/el Linux -ifeq ($(strip $(filter-out mips64el linux%,$(target_cpu) $(target_os))),) - LIBGNAT_TARGET_PAIRS_COMMON = \ - a-intnam.ads<a-intnam-linux.ads \ - s-inmaop.adb<s-inmaop-posix.adb \ - s-intman.adb<s-intman-posix.adb \ - s-linux.ads<s-linux-mipsel.ads \ - s-osinte.adb<s-osinte-posix.adb \ - s-osinte.ads<s-osinte-linux.ads \ - s-osprim.adb<s-osprim-posix.adb \ - s-taprop.adb<s-taprop-linux.adb \ - s-tasinf.ads<s-tasinf-linux.ads \ - s-tasinf.adb<s-tasinf-linux.adb \ - s-taspri.ads<s-taspri-posix-noaltstack.ads \ - s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ - g-sercom.adb<g-sercom-linux.adb - - LIBGNAT_TARGET_PAIRS_32 = \ - system.ads<system-linux-mipsel.ads - - LIBGNAT_TARGET_PAIRS_64 = \ - system.ads<system-linux-mips64el.ads - - ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64) + ifneq (,$(or $(filter mips64el%, $(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 @@ -1961,7 +1918,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),) LIBGNAT_TARGET_PAIRS_64 = \ system.ads<system-linux-ppc64.ads - ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64) + ifneq (,$(or $(filter powerpc64%, $(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 |