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: r181472

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 97484e5c691c6e416e88028972c3f4d03baf4c1c..7ae36459dfd5fea365d1b251ed088c4dff846d4d 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-13  Iain Sandoe  <iains@gcc.gnu.org>
 
        Backport from mainline r181319

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index fa3aec5d193eccc953f1ad1e7510d18dc392e3d1..77027dd82a10501678451fd5c4cb4cacaf18f18d 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2189,7 +2189,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 5bab21df7979c4a06afa4e711e7d5951b85480db..fc66423864f62f954766463cd835d99debdf1b83 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;
@@ -67,15 +65,6 @@ package body MLib.Tgt.Specific is
                       (1 => Flat_Namespace'Access,
                        2 => 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 --
    ---------------------------
@@ -180,7 +169,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;