diff mbox

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

Message ID EDB53EF4-9B7A-49A4-BE06-74DF4957593F@sandoe-acoustics.co.uk
State New
Headers show

Commit Message

Iain Sandoe Nov. 13, 2011, 9:56 a.m. UTC 
On 10 Nov 2011, at 13:44, Tristan Gingold wrote:
> You can simplify further m-lib-tgt-specific-darwin.adb as the  
> default indexer options is nothing:

thanks - I wasn't confident to remove it entirely, but that is a much  
better solution.

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


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

likewise on *-darwin9 (re-tested on ppc-darwin with the revised patch  
and the other changes in trunk).

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

see revised patch/Changelog.

Ok for trunk/4.6?
Iain

===

2011-xx-yy  Tristan Gingold  <...
             Iain Sandoe  <...

gcc/ada:

	PR target/49992
	* mlib-tgt-specific-darwin.adb (Archive_Indexer_Options): Remove.

	* gcc-interface/Makefile.in (darwin): Likewise.

Comments

Iain Sandoe Nov. 13, 2011, 11:34 a.m. UTC | #1 
On 13 Nov 2011, at 09:56, Iain Sandoe wrote:

>
> On 10 Nov 2011, at 13:44, Tristan Gingold wrote:
>> You can simplify further m-lib-tgt-specific-darwin.adb as the  
>> default indexer options is nothing:
>
> thanks - I wasn't confident to remove it entirely, but that is a  
> much better solution.
>
>> I have tested this chunk together with the one you provided for  
>> Makefile.in:
>
>
>> and I didn't find regressions in our test suite (on x86_64-darwin).
>
> likewise on *-darwin9 (re-tested on ppc-darwin with the revised  
> patch and the other changes in trunk).
>
>> I think you just need to rewrite the ChangeLog entry to get the OK  
>> from an Ada maintainer.
>
> see revised patch/Changelog.
>
> Ok for trunk/4.6?
> Iain
>
> ===

Uhhh that'll teach me to cut&paste (well.. maybe not ;-))


> 2011-xx-yy  Tristan Gingold  <...
>            Iain Sandoe  <...
>
> gcc/ada:

	PR target/49992
	* mlib-tgt-specific-darwin.adb (Archive_Indexer_Options): Remove.
	* gcc-interface/Makefile.in (darwin): Remove ranlib special-casing
	  for Darwin.

> <181319-pr49992-part2-revised.txt>
>
>
diff mbox

Patch

Index: gcc/ada/mlib-tgt-specific-darwin.adb
===================================================================
--- gcc/ada/mlib-tgt-specific-darwin.adb	(revision 181311)
+++ gcc/ada/mlib-tgt-specific-darwin.adb	(working copy)
@@ -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;
Index: gcc/ada/gcc-interface/Makefile.in
===================================================================
--- gcc/ada/gcc-interface/Makefile.in	(revision 181311)
+++ gcc/ada/gcc-interface/Makefile.in	(working copy)
@@ -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