From 1e1ae0afd8adb79708a34b962bbe3a228f07f68e Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Fri, 18 Nov 2011 10:54:21 +0000 Subject: [PATCH] re PR target/49992 (lto-bootstrap reveals duplicate symbols on x86_64-apple-darwin11) gcc/ada: 2011-11-18 Tristan Gingold Iain Sandoe PR target/49992 * mlib-tgt-specific-darwin.adb (Archive_Indexer_Options): Remove. * gcc-interface/Makefile.in (darwin): Remove ranlib special-casing for Darwin. Co-Authored-By: Iain Sandoe From-SVN: r181470 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/gcc-interface/Makefile.in | 1 - gcc/ada/mlib-tgt-specific-darwin.adb | 12 ------------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f8d6489ac83d..8da84db096c8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2011-11-18 Tristan Gingold + Iain Sandoe + + PR target/49992 + * mlib-tgt-specific-darwin.adb (Archive_Indexer_Options): Remove. + * gcc-interface/Makefile.in (darwin): Remove ranlib special-casing + for Darwin. + 2011-11-12 Iain Sandoe * gcc-interface/Makefile.in (stamp-gnatlib-$(RTSDIR)): Don't link diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index d000b5df779d..ebb7ddb949f5 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -2182,7 +2182,6 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin - RANLIB = ranlib -c GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) soext = .dylib diff --git a/gcc/ada/mlib-tgt-specific-darwin.adb b/gcc/ada/mlib-tgt-specific-darwin.adb index e04225370eb9..13beb04a8bf8 100644 --- a/gcc/ada/mlib-tgt-specific-darwin.adb +++ b/gcc/ada/mlib-tgt-specific-darwin.adb @@ -36,8 +36,6 @@ package body MLib.Tgt.Specific is -- Non default subprograms - function Archive_Indexer_Options return String_List_Access; - procedure Build_Dynamic_Library (Ofiles : Argument_List; Options : Argument_List; @@ -62,15 +60,6 @@ package body MLib.Tgt.Specific is Shared_Options : constant Argument_List := (1 => Shared_Libgcc'Access); - ----------------------------- - -- Archive_Indexer_Options -- - ----------------------------- - - function Archive_Indexer_Options return String_List_Access is - begin - return new String_List'(1 => new String'("-c")); - end Archive_Indexer_Options; - --------------------------- -- Build_Dynamic_Library -- --------------------------- @@ -175,7 +164,6 @@ package body MLib.Tgt.Specific is end Is_Archive_Ext; begin - Archive_Indexer_Options_Ptr := Archive_Indexer_Options'Access; Build_Dynamic_Library_Ptr := Build_Dynamic_Library'Access; DLL_Ext_Ptr := DLL_Ext'Access; Dynamic_Option_Ptr := Dynamic_Option'Access; -- 2.47.2