diff options
author | Iain Sandoe <iains@gcc.gnu.org> | 2011-09-06 18:53:29 +0000 |
---|---|---|
committer | Iain Sandoe <iains@gcc.gnu.org> | 2011-09-06 18:53:29 +0000 |
commit | 84ef27d38576671e6b0abc3bee63b4a185c49dd7 (patch) | |
tree | 0ee860993a0797d73c7f02fadcccee03942be4e3 | |
parent | a1bf1ec79f45664fa35358fa37bcecddf068a02e (diff) | |
download | gcc-84ef27d38576671e6b0abc3bee63b4a185c49dd7.zip gcc-84ef27d38576671e6b0abc3bee63b4a185c49dd7.tar.gz gcc-84ef27d38576671e6b0abc3bee63b4a185c49dd7.tar.bz2 |
Makefile.in (darwin, SO_OPTS): Provide architecture size switches to the link phase for shared libs.
* gcc-interface/Makefile.in (darwin, SO_OPTS): Provide architecture
size switches to the link phase for shared libs.
From-SVN: r178606
-rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6cda14b..f01481c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2011-09-06 Iain Sandoe <iains@gcc.gnu.org> + * gcc-interface/Makefile.in (darwin, SO_OPTS): Provide architecture + size switches to the link phase for shared libs. + +2011-09-06 Iain Sandoe <iains@gcc.gnu.org> + * gcc-interface/Makefile.in (x86_64 darwin arch): Adjust LIBGNAT_TARGET_PAIRS for x86 and x86_64 variants. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index bc95aff..db1e2d9 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -2164,6 +2164,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),) endif ifeq ($(strip $(filter-out darwin%,$(osys))),) + SO_OPTS = -Wl,-flat_namespace -shared-libgcc ifeq ($(strip $(filter-out %86,$(arch))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<a-intnam-darwin.ads \ @@ -2184,6 +2185,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) LIBGNAT_TARGET_PAIRS += \ $(X86_64_TARGET_PAIRS) \ system.ads<system-darwin-x86_64.ads + SO_OPTS += -m64 else LIBGNAT_TARGET_PAIRS += \ $(X86_TARGET_PAIRS) \ @@ -2211,6 +2213,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) LIBGNAT_TARGET_PAIRS += \ $(X86_TARGET_PAIRS) \ system.ads<system-darwin-x86.ads + SO_OPTS += -m32 else LIBGNAT_TARGET_PAIRS += \ $(X86_64_TARGET_PAIRS) \ @@ -2243,7 +2246,6 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin - SO_OPTS = -Wl,-flat_namespace -shared-libgcc RANLIB = ranlib -c GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) |