diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 50 |
2 files changed, 20 insertions, 35 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cab378d..22fedb8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2011-09-29 Iain Sandoe <iains@gcc.gnu.org> + + * gcc-interface/Makefile.in (Darwin): Factor LIBGNAT_TARGET_PAIRS + across the port. + 2011-09-27 Ed Schonberg <schonberg@adacore.com> * a-cbhase.adb, a-cbhase.ads, a-cborse.adb, a-cborse.ads, diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index c463cd6..fffda76 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -2136,21 +2136,23 @@ endif ifeq ($(strip $(filter-out darwin%,$(osys))),) SO_OPTS = -shared-libgcc - ifeq ($(strip $(filter-out %86,$(arch))),) - LIBGNAT_TARGET_PAIRS = \ + LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<a-intnam-darwin.ads \ i-forbla.adb<i-forbla-darwin.adb \ s-inmaop.adb<s-inmaop-posix.adb \ - s-intman.adb<s-intman-susv3.adb \ s-osinte.adb<s-osinte-darwin.adb \ s-osinte.ads<s-osinte-darwin.ads \ - s-osprim.adb<s-osprim-darwin.adb \ s-taprop.adb<s-taprop-posix.adb \ s-taspri.ads<s-taspri-posix.ads \ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ g-trasym.ads<g-trasym-unimplemented.ads \ - g-trasym.adb<g-trasym-unimplemented.adb \ - $(ATOMICS_TARGET_PAIRS) + g-trasym.adb<g-trasym-unimplemented.adb + + ifeq ($(strip $(filter-out %86,$(arch))),) + LIBGNAT_TARGET_PAIRS += \ + s-intman.adb<s-intman-susv3.adb \ + s-osprim.adb<s-osprim-darwin.adb \ + $(ATOMICS_TARGET_PAIRS) ifeq ($(strip $(MULTISUBDIR)),/x86_64) LIBGNAT_TARGET_PAIRS += \ @@ -2165,20 +2167,10 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) endif ifeq ($(strip $(filter-out %x86_64,$(arch))),) - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<a-intnam-darwin.ads \ - i-forbla.adb<i-forbla-darwin.adb \ - s-inmaop.adb<s-inmaop-posix.adb \ - s-intman.adb<s-intman-susv3.adb \ - s-osinte.adb<s-osinte-darwin.adb \ - s-osinte.ads<s-osinte-darwin.ads \ - s-osprim.adb<s-osprim-darwin.adb \ - s-taprop.adb<s-taprop-posix.adb \ - s-taspri.ads<s-taspri-posix.ads \ - s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ - g-trasym.ads<g-trasym-unimplemented.ads \ - g-trasym.adb<g-trasym-unimplemented.adb \ - $(ATOMICS_TARGET_PAIRS) + LIBGNAT_TARGET_PAIRS += \ + s-intman.adb<s-intman-susv3.adb \ + s-osprim.adb<s-osprim-darwin.adb \ + $(ATOMICS_TARGET_PAIRS) ifeq ($(strip $(MULTISUBDIR)),/i386) LIBGNAT_TARGET_PAIRS += \ @@ -2193,21 +2185,9 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) endif ifeq ($(strip $(filter-out powerpc%,$(arch))),) - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<a-intnam-darwin.ads \ - i-forbla.adb<i-forbla-darwin.adb \ - s-inmaop.adb<s-inmaop-posix.adb \ - s-intman.adb<s-intman-posix.adb \ - s-osinte.adb<s-osinte-darwin.adb \ - s-osinte.ads<s-osinte-darwin.ads \ - s-osprim.adb<s-osprim-posix.adb \ - s-taprop.adb<s-taprop-posix.adb \ - s-taspri.ads<s-taspri-posix.ads \ - s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ - a-numaux.ads<a-numaux-darwin.ads \ - a-numaux.adb<a-numaux-darwin.adb \ - g-trasym.ads<g-trasym-unimplemented.ads \ - g-trasym.adb<g-trasym-unimplemented.adb + LIBGNAT_TARGET_PAIRS += \ + s-intman.adb<s-intman-posix.adb \ + s-osprim.adb<s-osprim-posix.adb ifeq ($(strip $(MULTISUBDIR)),/ppc64) LIBGNAT_TARGET_PAIRS += \ |