re PR target/49992 (lto-bootstrap reveals duplicate symbols on x86_64-apple-darwin11)

gcc/ada:

2011-11-18  Tristan Gingold  <gingold@adacore.com>
	    Iain Sandoe  <iains@gcc.gnu.org>

	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 <iains@gcc.gnu.org>
From-SVN: r181470

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f8d6489ac83dbd98e54cb45e4be912ba701520a0..8da84db096c84f5766680860536b7f924b59eacc 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-18  Tristan Gingold  <gingold@adacore.com>
+           Iain Sandoe  <iains@gcc.gnu.org>
+
+       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  <iains@gcc.gnu.org>
 
        * 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 d000b5df779d3cc05558cee762b67c2bb44f2f88..ebb7ddb949f52518b697fe2fd6074eee71b0652f 100644 (file)
--- 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 e04225370eb9c64b2e846869b09bd4a361ef551d..13beb04a8bf84293f1f47854907500dd48f3b964 100644 (file)
--- 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;