Patchwork [Darwin/PR49992,2/2] remove ranlib special-casing from the darwin port.

login
register
mail settings
Submitter Tristan Gingold
Date Nov. 10, 2011, 1:44 p.m.
Message ID <90F112D2-4215-4AAB-AB63-1E56DE0CFCFE@adacore.com>
Download mbox | patch
Permalink /patch/124881/
State New
Headers show

Comments

Tristan Gingold - Nov. 10, 2011, 1:44 p.m.
Hi Iain,

Late reply from gcc-patches archive.

You can simplify further m-lib-tgt-specific-darwin.adb as the default indexer options is nothing:

   soext = .dylib

and I didn't find regressions in our test suite (on x86_64-darwin).

I think you just need to rewrite the ChangeLog entry to get the OK from an Ada maintainer.

Tristan.

Patch

Index: mlib-tgt-specific-darwin.adb
===================================================================
--- mlib-tgt-specific-darwin.adb	(revision 180458)
+++ mlib-tgt-specific-darwin.adb	(working copy)
@@ -36,8 +36,6 @@ 
 
    --  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 @@ 
    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 @@ 
    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;


I have tested this chunk together with the one you provided for Makefile.in:

Index: gcc/ada/gcc-interface/Makefile.in
===================================================================
--- gcc/ada/gcc-interface/Makefile.in	(revision 179962)
+++ gcc/ada/gcc-interface/Makefile.in	(working copy)
@@ -2179,7 +2179,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)