procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libitm/52042 (libitm.c/clone-1.c (all darwin) and libitm.c/stackundo.c (darwin 11) execution tests fail with -fpie)

Browse source 
2012-02-15  Iain Sandoe  <iains@gcc.gnu.org>
	    Patrick Marlier  <patrick.marlier@gmail.com>

	PR libitm/52042
	* config/darwin-crt-tm.c (getTMCloneTable): New function.
	(__doTMRegistrations): Call it.
	(__doTMdeRegistrations): Likewise. 


Co-Authored-By: Patrick Marlier <patrick.marlier@gmail.com>

From-SVN: r184281
This commit is contained in:
Iain Sandoe 2012-02-15 19:17:42 +00:00 • committed by Patrick Marlier
parent 3c87288384
commit 6017aed304
2 changed files with 60 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libgcc/ChangeLog
View file

@ -1,3 +1,11 @@
2012-02-15 Iain Sandoe <iains@gcc.gnu.org>
Patrick Marlier <patrick.marlier@gmail.com>
PR libitm/52042
* config/darwin-crt-tm.c (getTMCloneTable): New function.
(__doTMRegistrations): Call it.
(__doTMdeRegistrations): Likewise.
2012-01-15 Georg-Johann Lay <avr@gjlay.de>
Anatoly Sokolov <aesok@post.ru>
Eric Weddington <eric.weddington@atmel.com>

76
libgcc/config/darwin-crt-tm.c
View file

@ -23,33 +23,67 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include "tsystem.h"
#include <stddef.h>
#include <dlfcn.h>
#include <mach-o/dyld.h>
#include <mach-o/getsect.h>
/* not listed in mach-o/dyld.h for some reason. */
extern char * getsectdata (const char*,const char*,unsigned long*);
#ifdef __LP64__
#define GET_DATA_TMCT(mh,size) \
getsectdatafromheader_64 ((struct mach_header_64*) mh, \
"__DATA", "__tm_clone_table", (uint64_t *)size)
#else
#define GET_DATA_TMCT(mh,size) \
getsectdatafromheader (mh, "__DATA", "__tm_clone_table", (uint32_t *)size)
#endif
#define WEAK __attribute__((weak))
extern void _ITM_registerTMCloneTable (void *, size_t) WEAK;
extern void _ITM_deregisterTMCloneTable (void *) WEAK;
#if defined(START) || defined(END)
static inline void *getTMCloneTable (const void *f, size_t *tmct_siz)
{
char *tmct_fixed, *tmct = NULL;
unsigned int i, img_count;
struct mach_header *mh;
Dl_info info;
if (! dladdr (f, &info) || info.dli_fbase == NULL)
abort ();
mh = (struct mach_header *) info.dli_fbase;
tmct_fixed = GET_DATA_TMCT (mh, tmct_siz);
*tmct_siz /= (sizeof (size_t) * 2);
/* No tm_clone_table or no clones. */
if (tmct_fixed == NULL || *tmct_siz == 0)
return NULL;
img_count = _dyld_image_count();
for (i = 0; i < img_count && tmct == NULL; i++)
{
if (mh == _dyld_get_image_header(i))
tmct = tmct_fixed + (unsigned long)_dyld_get_image_vmaddr_slide(i);
}
return tmct;
}
#endif
#ifdef START
void __doTMRegistrations (void) __attribute__ ((constructor));
void __doTMRegistrations (void)
{
char * tm_clone_table_sect_data;
unsigned long tmct_siz;
tm_clone_table_sect_data = getsectdata ("__DATA",
"__tm_clone_table",
&tmct_siz);
tmct_siz /= (sizeof (size_t) * 2);
if (_ITM_registerTMCloneTable != NULL
&& tm_clone_table_sect_data != NULL
&& tmct_siz > 0)
_ITM_registerTMCloneTable (tm_clone_table_sect_data, (size_t)tmct_siz);
size_t tmct_siz;
void *tmct;
tmct = getTMCloneTable ((const void *)&__doTMRegistrations, &tmct_siz);
if (_ITM_registerTMCloneTable != NULL && tmct != NULL)
_ITM_registerTMCloneTable (tmct, (size_t)tmct_siz);
}
#endif
@ -60,18 +94,12 @@ void __doTMdeRegistrations (void) __attribute__ ((destructor));
void __doTMdeRegistrations (void)
{
char * tm_clone_table_sect_data;
unsigned long tmct_siz;
tm_clone_table_sect_data = getsectdata ("__DATA",
"__tm_clone_table",
&tmct_siz);
if (_ITM_deregisterTMCloneTable != NULL
&& tm_clone_table_sect_data != NULL
&& tmct_siz > 0)
_ITM_deregisterTMCloneTable (tm_clone_table_sect_data);
size_t tmct_siz;
void *tmct;
tmct = getTMCloneTable ((const void *)&__doTMdeRegistrations, &tmct_siz);
if (_ITM_deregisterTMCloneTable != NULL && tmct != NULL)
_ITM_deregisterTMCloneTable (tmct);
}
#endif