Patchwork [libitm,darwin] PR52220 move dummy functions definition

login
register
mail settings
Submitter Patrick Marlier
Date Feb. 16, 2012, 2:17 a.m.
Message ID <4F3C6739.9020700@gmail.com>
Download mbox | patch
Permalink /patch/141477/
State New
Headers show

Comments

Patrick Marlier - Feb. 16, 2012, 2:17 a.m.
On 02/15/2012 08:24 PM, Jack Howarth wrote:
> On Wed, Feb 15, 2012 at 11:48:29PM +0000, Iain Sandoe wrote:
>>
>> On 15 Feb 2012, at 23:39, Patrick Marlier wrote:
>>
>>> 	PR libitm/52220
>>> 	* alloc_cpp.cc: No dummy definitions for darwin.
>>> 	* eh_cpp.cc: Likewise.
>>>
>>> libgcc/
>>> 2012-02-15  Iain Sandoe<iains@gcc.gnu.org>
>>> 	Patrick Marlier<patrick.marlier@gmail.com>
>>>
>>> 	PR libitm/52220
>>> 	* config/darwin-crt-tm.c: Generate dummy functions.
>>> <darwin-pr52220.patch>
>>
>> thanks for taking care of this.
>> Iain
>
> Iain,
>     We are still failing...
>
> FAIL: libitm.c++/eh-1.C execution test
>
> on x86_64-apple-darwin11 as the committed patch is missing
> those changes from darwin-pie4.patch which addressed PR52220.
>           Jack

Iain told me that I made a mistake in the patch :(
Jack: could you just tell me if it solves the problem for you?
Sorry for that.

--
Patrick.

     ??? Define these dummy functions only when !HAVE_ELF_STYLE_WEAKREF. */
@@ -147,3 +145,5 @@ void *_ZnaXRKSt9nothrow_t (size_t s UNUSED, c_noth
    { return NULL; }
  void _ZdaPvRKSt9nothrow_t (void * a UNUSED, c_nothrow_p b UNUSED) { 
return; }

+#endif
+
IainS - Feb. 16, 2012, 9:52 a.m.
Hi Patrick,

On 16 Feb 2012, at 02:17, Patrick Marlier wrote:
>
> Index: libgcc/config/darwin-crt-tm.c
> ===================================================================
> --- libgcc/config/darwin-crt-tm.c       (revision 184293)
> +++ libgcc/config/darwin-crt-tm.c       (working copy)
> @@ -103,8 +103,6 @@ void __doTMdeRegistrations (void)
>     _ITM_deregisterTMCloneTable (tmct);
> }
>
> -#endif
> -
> /* Provide dummy functions to satisfy linkage for versions of the  
> Darwin
>    tool-chain that that can't handle undefined weak refs at the link  
> stage.
>    ??? Define these dummy functions only when ! 
> HAVE_ELF_STYLE_WEAKREF. */
> @@ -147,3 +145,5 @@ void *_ZnaXRKSt9nothrow_t (size_t s UNUSED, c_noth
>   { return NULL; }
> void _ZdaPvRKSt9nothrow_t (void * a UNUSED, c_nothrow_p b UNUSED)  
> { return; }
>
> +#endif

I've applied this, hopefully we're good to go with TM on Darwin for 4.7.

BTW, you should add yourself to the MAINTAINERS file as per: http://gcc.gnu.org/svnwrite.html

thanks,
Iain

Patch

Index: libgcc/config/darwin-crt-tm.c
===================================================================
--- libgcc/config/darwin-crt-tm.c       (revision 184293)
+++ libgcc/config/darwin-crt-tm.c       (working copy)
@@ -103,8 +103,6 @@  void __doTMdeRegistrations (void)
      _ITM_deregisterTMCloneTable (tmct);
  }

-#endif
-
  /* Provide dummy functions to satisfy linkage for versions of the Darwin
     tool-chain that that can't handle undefined weak refs at the link 
stage.