diff options
| author | Jose Ruiz <ruiz@adacore.com> | 2010-10-25 15:28:13 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-25 17:28:13 +0200 |
| commit | ab0c3d8ef58e04b46f29ecb20109032a057c6927 (patch) | |
| tree | c3437c31188ed5032cb13a0baf666b752d9042b0 /gcc | |
| parent | ff2efe85eb639b398d150365db037fedadecc4d8 (diff) | |
| download | gcc-ab0c3d8ef58e04b46f29ecb20109032a057c6927.zip gcc-ab0c3d8ef58e04b46f29ecb20109032a057c6927.tar.gz gcc-ab0c3d8ef58e04b46f29ecb20109032a057c6927.tar.bz2 | |
Makefile.in (LIBGNAT_TARGET_PAIRS for powerpc-linux): Reorganize target pairs so that it works on linux and ElinOS.
2010-10-25 Jose Ruiz <ruiz@adacore.com>
* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS for powerpc-linux):
Reorganize target pairs so that it works on linux and ElinOS.
From-SVN: r165921
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 39 |
2 files changed, 23 insertions, 21 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f772cf4..cf21c37 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-10-25 Jose Ruiz <ruiz@adacore.com> + + * gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS for powerpc-linux): + Reorganize target pairs so that it works on linux and ElinOS. + 2010-10-25 Pascal Obry <obry@adacore.com> * adaint.c (__gnat_file_time_name_attr): Use GetFileAttributesEx to get diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index f4a5c23..29a79d7 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1790,31 +1790,15 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),) s-intman.adb<s-intman-posix.adb \ s-linux.ads<s-linux.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 \ + g-trasym.adb<g-trasym-dwarf.adb \ $(ATOMICS_TARGET_PAIRS) - LIBGNAT_TARGET_PAIRS_32 = \ - system.ads<system-linux-ppc.ads - - LIBGNAT_TARGET_PAIRS_64 = \ - system.ads<system-linux-ppc64.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 + ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS = \ - $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32) - endif + $(LIBGNAT_TARGET_PAIRS_COMMON) - ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS += \ s-osinte.ads<s-osinte-linux-xenomai.ads \ s-osprim.adb<s-osprim-linux-xenomai.adb \ @@ -1822,14 +1806,27 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),) s-taspri.ads<s-taspri-linux-xenomai.ads \ system.ads<system-linux-ppc-xenomai.ads else + LIBGNAT_TARGET_PAIRS_32 = \ + system.ads<system-linux-ppc.ads + + LIBGNAT_TARGET_PAIRS_64 = \ + system.ads<system-linux-ppc64.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 + LIBGNAT_TARGET_PAIRS += \ 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 \ - system.ads<system-linux-ppc.ads + s-taspri.ads<s-taspri-posix-noaltstack.ads endif TOOLS_TARGET_PAIRS = \ |