/trunk/gcc-patches/gcc4.5/eh_shmem.patch

http://pcxprj.googlecode.com/ · Patch · 594 lines · 543 code · 51 blank · 0 comment · 0 complexity · 060d522e025245a6bdfae6cd04b1683e MD5 · raw file 

    

  1. # HG changeset patch
    2. 

  2. # Parent 0128c92731b8c043818ff384a2baf895989a197f
    3. 

  3. 

  4. diff -r 0128c92731b8 gcc/config/i386/shmem-win32.c
    5. 

  5. --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    6. 

  6. +++ b/gcc/config/i386/shmem-win32.c	Tue Dec 21 20:56:42 2010 -0700
    7. 

  7. @@ -0,0 +1,108 @@
    8. 

  8. +/* -- shmem-win32.c --
    9. 

  9. + *
    10. 

  10. + * See gcc/shmem.h for a description of __SHMEM.
    11. 

  11. + *
    12. 

  12. + * This is the win32 implementation of __SHMEM, based in part on a mechanism
    13. 

  13. + * originally developed by Thomas Pfaff and Adriano dos Santos Fernandes,
    14. 

  14. + * reimplemented by JohnE as of 2010.
    15. 

  15. + *
    16. 

  16. + * This code is released into the public domain without warranty; it may be
    17. 

  17. + * freely used and redistributed.
    18. 

  18. + */
    19. 

  19. +
    20. 

  20. +
    21. 

  21. +#include "shmem.h"
    22. 

  22. +
    23. 

  23. +#define WIN32_LEAN_AND_MEAN
    24. 

  24. +#include <windows.h>
    25. 

  25. +#include <malloc.h>
    26. 

  26. +
    27. 

  27. +
    28. 

  28. +static const char* shmem_version_prefix = "gcc-shmem-tdm2";
    29. 

  29. +
    30. 

  30. +
    31. 

  31. +static void __w32sp_trap(void)
    32. 

  32. +{
    33. 

  33. +	asm("int $0x3");
    34. 

  34. +}
    35. 

  35. +
    36. 

  36. +
    37. 

  37. +static void* get_ptr_from_atom(ATOM atom, char* name_buf, int name_buf_len, int ptr_offset)
    38. 

  38. +{
    39. 

  39. +	int ptr_len = sizeof(void*) * 8;
    40. 

  40. +	if (name_buf_len - ptr_offset < ptr_len)
    41. 

  41. +		__w32sp_trap();
    42. 

  42. +	if (!GetAtomNameA(atom, name_buf, name_buf_len))
    43. 

  43. +		__w32sp_trap();
    44. 

  44. +	size_t ptr = 0;
    45. 

  45. +	int i = 0;
    46. 

  46. +	for (; i < ptr_len; ++i)
    47. 

  47. +	{
    48. 

  48. +		if (name_buf[ptr_offset + i] == 'A')
    49. 

  49. +			ptr |= (1 << (ptr_len - i));
    50. 

  50. +	}
    51. 

  51. +	return (void*)ptr;
    52. 

  52. +}
    53. 

  53. +
    54. 

  54. +
    55. 

  55. +void* __shmem_grab(const char* name, int size, void (*initfunc)(void*))
    56. 

  56. +{
    57. 

  57. +	int prefix_len = strlen(shmem_version_prefix);
    58. 

  58. +	int name_len = strlen(name);
    59. 

  59. +	int ptr_len = sizeof(void*) * 8;
    60. 

  60. +
    61. 

  61. +	char full_atom_name[prefix_len + 1 + name_len + 1 + ptr_len + 1];
    62. 

  62. +
    63. 

  63. +	memcpy(full_atom_name, shmem_version_prefix, prefix_len);
    64. 

  64. +	full_atom_name[prefix_len] = '-';
    65. 

  65. +	memcpy(full_atom_name + prefix_len + 1, name, name_len);
    66. 

  66. +	memset(full_atom_name + prefix_len + 1 + name_len + 1, 'a', ptr_len);
    67. 

  67. +	full_atom_name[prefix_len + 1 + name_len + 1 + ptr_len] = 0;
    68. 

  68. +
    69. 

  69. +	full_atom_name[prefix_len + 1 + name_len] = 0;
    70. 

  70. +	HANDLE hmutex = CreateMutexA(0, FALSE, full_atom_name);
    71. 

  71. +	full_atom_name[prefix_len + 1 + name_len] = '-';
    72. 

  72. +	if (WaitForSingleObject(hmutex, INFINITE) != WAIT_OBJECT_0)
    73. 

  73. +		__w32sp_trap();
    74. 

  74. +
    75. 

  75. +	ATOM atom = FindAtomA(full_atom_name);
    76. 

  76. +
    77. 

  77. +	void* ret = 0;
    78. 

  78. +
    79. 

  79. +	if (atom)
    80. 

  80. +	{
    81. 

  81. +		ret = get_ptr_from_atom(atom, full_atom_name,
    82. 

  82. +		 prefix_len + 1 + name_len + 1 + ptr_len, prefix_len + 1 + name_len + 1);
    83. 

  83. +	}
    84. 

  84. +	else
    85. 

  85. +	{
    86. 

  86. +		void* shared_mem = malloc(size);
    87. 

  87. +
    88. 

  88. +		int i = 0;
    89. 

  89. +		for (; i < ptr_len; ++i)
    90. 

  90. +		{
    91. 

  91. +			if ((((size_t)shared_mem) >> (ptr_len - i)) & 1)
    92. 

  92. +				full_atom_name[prefix_len + 1 + name_len + 1 + i] = 'A';
    93. 

  93. +		}
    94. 

  94. +
    95. 

  95. +		atom = AddAtomA(full_atom_name);
    96. 

  96. +		if (!atom)
    97. 

  97. +			__w32sp_trap();
    98. 

  98. +
    99. 

  99. +		ret = get_ptr_from_atom(atom, full_atom_name,
    100. 

  100. +		 prefix_len + 1 + name_len + 1 + ptr_len, prefix_len + 1 + name_len + 1);
    101. 

  101. +		if (ret == shared_mem)
    102. 

  102. +		{
    103. 

  103. +			memset(ret, 0, size);
    104. 

  104. +			if (initfunc)
    105. 

  105. +				initfunc(ret);
    106. 

  106. +		}
    107. 

  107. +		else
    108. 

  108. +			free(shared_mem);
    109. 

  109. +	}
    110. 

  110. +
    111. 

  111. +	ReleaseMutex(hmutex);
    112. 

  112. +	CloseHandle(hmutex);
    113. 

  113. +
    114. 

  114. +	return ret;
    115. 

  115. +}
    116. 

  116. diff -r 0128c92731b8 gcc/config/i386/t-gthr-win32
    117. 

  117. --- a/gcc/config/i386/t-gthr-win32	Mon Dec 20 17:17:01 2010 -0700
    118. 

  118. +++ b/gcc/config/i386/t-gthr-win32	Tue Dec 21 20:56:42 2010 -0700
    119. 

  119. @@ -1,2 +1,2 @@
    120. 

  120.  # We hide calls to w32api needed for w32 thread support here:
    121. 

  121. -LIB2FUNCS_EXTRA = $(srcdir)/config/i386/gthr-win32.c
    122. 

  122. +LIB2FUNCS_EXTRA += $(srcdir)/config/i386/gthr-win32.c
    123. 

  123. diff -r 0128c92731b8 gcc/shmem.h
    124. 

  124. --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    125. 

  125. +++ b/gcc/shmem.h	Tue Dec 21 20:56:42 2010 -0700
    126. 

  126. @@ -0,0 +1,98 @@
    127. 

  127. +/* -- shmem.h --
    128. 

  128. + *
    129. 

  129. + * The __SHMEM mechanism is for sharing named pointers among the instances of a
    130. 

  130. + * static library compiled into separate modules (binaries or shared libraries)
    131. 

  131. + * in one runtime program. It's used in libgcc and libstdc++ to be able to
    132. 

  132. + * propagate exceptions out of shared libraries even which libgcc and libstdc++
    133. 

  133. + * are compiled in statically.
    134. 

  134. + *
    135. 

  135. + * This code is released into the public domain without warranty; it may be
    136. 

  136. + * freely used and redistributed.
    137. 

  137. + */
    138. 

  138. +
    139. 

  139. +
    140. 

  140. +#if defined(_WIN32) || defined(_WIN64)
    141. 

  141. +#define HAVE_SHMEM_IMPL
    142. 

  142. +#endif
    143. 

  143. +
    144. 

  144. +
    145. 

  145. +#if defined(HAVE_SHMEM_IMPL) && !defined(SHARED)
    146. 

  146. +
    147. 

  147. +
    148. 

  148. +#ifdef __cplusplus
    149. 

  149. +#define __SHMEM_CLINK extern "C"
    150. 

  150. +#else
    151. 

  151. +#define __SHMEM_CLINK
    152. 

  152. +#endif
    153. 

  153. +
    154. 

  154. +
    155. 

  155. +__SHMEM_CLINK void *__shmem_grab(const char *name, int size, void (*initfunc)(void *));
    156. 

  156. +
    157. 

  157. +
    158. 

  158. +#define __SHMEM_CONCAT2(a, b) __CONCAT2_INDIR(a, b)
    159. 

  159. +#define __CONCAT2_INDIR(a, b) a ## b
    160. 

  160. +
    161. 

  161. +
    162. 

  162. +#define __SHMEM_DEFINE(type, name) \
    163. 

  163. + type* __SHMEM_CONCAT2(__shmem_ptr_, name) = 0; \
    164. 

  164. + type* __SHMEM_CONCAT2(__shmem_grabber_, name)() \
    165. 

  165. + { \
    166. 

  166. +   return (type*)__shmem_grab(# name, sizeof(type), 0); \
    167. 

  167. + }
    168. 

  168. +
    169. 

  169. +#define __SHMEM_DEFINE_INIT(type, name, initval) \
    170. 

  170. + type* __SHMEM_CONCAT2(__shmem_ptr_, name) = 0; \
    171. 

  171. + __SHMEM_CLINK void __SHMEM_CONCAT2(__shmem_init_, name)(void *mem) \
    172. 

  172. + { \
    173. 

  173. +   type temp = initval; \
    174. 

  174. +   *((type*)mem) = temp; \
    175. 

  175. + } \
    176. 

  176. + type* __SHMEM_CONCAT2(__shmem_grabber_, name)() \
    177. 

  177. + { \
    178. 

  178. +   return (type*)__shmem_grab(# name, sizeof(type), __SHMEM_CONCAT2(__shmem_init_, name)); \
    179. 

  179. + }
    180. 

  180. +
    181. 

  181. +#define __SHMEM_DEFINE_ARRAY(type, name, size) \
    182. 

  182. + type* __SHMEM_CONCAT2(__shmem_ptr_, name) = 0; \
    183. 

  183. + type* __SHMEM_CONCAT2(__shmem_grabber_, name)() \
    184. 

  184. + { \
    185. 

  185. +   return (type*)__shmem_grab(# name, sizeof(type) * size, 0); \
    186. 

  186. + }
    187. 

  187. +
    188. 

  188. +
    189. 

  189. +#define __SHMEM_DECLARE(type, name) \
    190. 

  190. + extern type* __SHMEM_CONCAT2(__shmem_ptr_, name); \
    191. 

  191. + type* __SHMEM_CONCAT2(__shmem_grabber_, name)();
    192. 

  192. +
    193. 

  193. +
    194. 

  194. +#define __SHMEM_GET(name) \
    195. 

  195. + (*( \
    196. 

  196. + (__SHMEM_CONCAT2(__shmem_ptr_, name)) \
    197. 

  197. + ? \
    198. 

  198. + (__SHMEM_CONCAT2(__shmem_ptr_, name)) \
    199. 

  199. + : \
    200. 

  200. + ((__SHMEM_CONCAT2(__shmem_ptr_, name)) = __SHMEM_CONCAT2(__shmem_grabber_, name)()) \
    201. 

  201. + ))
    202. 

  202. +
    203. 

  203. +#define __SHMEM_GET_ARRAY(name) \
    204. 

  204. + ( \
    205. 

  205. + (__SHMEM_CONCAT2(__shmem_ptr_, name)) \
    206. 

  206. + ? \
    207. 

  207. + (__SHMEM_CONCAT2(__shmem_ptr_, name)) \
    208. 

  208. + : \
    209. 

  209. + ((__SHMEM_CONCAT2(__shmem_ptr_, name)) = __SHMEM_CONCAT2(__shmem_grabber_, name)()) \
    210. 

  210. + )
    211. 

  211. +
    212. 

  212. +
    213. 

  213. +#else
    214. 

  214. +
    215. 

  215. +
    216. 

  216. +#define __SHMEM_DEFINE(type, name) type name;
    217. 

  217. +#define __SHMEM_DEFINE_INIT(type, name, initval) type name = initval;
    218. 

  218. +#define __SHMEM_DEFINE_ARRAY(type, name, size) type name[size];
    219. 

  219. +#define __SHMEM_DECLARE(type, name) extern type name;
    220. 

  220. +#define __SHMEM_GET(name) name
    221. 

  221. +#define __SHMEM_GET_ARRAY(name) name
    222. 

  222. +
    223. 

  223. +
    224. 

  224. +#endif
    225. 

  225. diff -r 0128c92731b8 gcc/unwind-dw2-fde.c
    226. 

  226. --- a/gcc/unwind-dw2-fde.c	Mon Dec 20 17:17:01 2010 -0700
    227. 

  227. +++ b/gcc/unwind-dw2-fde.c	Tue Dec 21 20:56:42 2010 -0700
    228. 

  228. @@ -35,20 +35,24 @@
    229. 

  229.  #include "unwind-pe.h"
    230. 

  230.  #include "unwind-dw2-fde.h"
    231. 

  231.  #include "gthr.h"
    232. 

  232. +#include "shmem.h"
    233. 

  233.  #endif
    234. 

  234.  
    235. 

  235.  /* The unseen_objects list contains objects that have been registered
    236. 

  236.     but not yet categorized in any way.  The seen_objects list has had
    237. 

  237.     its pc_begin and count fields initialized at minimum, and is sorted
    238. 

  238.     by decreasing value of pc_begin.  */
    239. 

  239. -static struct object *unseen_objects;
    240. 

  240. -static struct object *seen_objects;
    241. 

  241. +__SHMEM_DEFINE(struct object *, unseen_objects)
    242. 

  242. +#define unseen_objects __SHMEM_GET(unseen_objects)
    243. 

  243. +__SHMEM_DEFINE(struct object *, seen_objects)
    244. 

  244. +#define seen_objects __SHMEM_GET(seen_objects)
    245. 

  245.  
    246. 

  246.  #ifdef __GTHREAD_MUTEX_INIT
    247. 

  247. -static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT;
    248. 

  248. +__SHMEM_DEFINE_INIT(__gthread_mutex_t, object_mutex, __GTHREAD_MUTEX_INIT)
    249. 

  249.  #else
    250. 

  250. -static __gthread_mutex_t object_mutex;
    251. 

  251. +__SHMEM_DEFINE(__gthread_mutex_t, object_mutex)
    252. 

  252.  #endif
    253. 

  253. +#define object_mutex __SHMEM_GET(object_mutex)
    254. 

  254.  
    255. 

  255.  #ifdef __GTHREAD_MUTEX_INIT_FUNCTION
    256. 

  256.  static void
    257. 

  257. @@ -57,11 +61,11 @@
    258. 

  258.    __GTHREAD_MUTEX_INIT_FUNCTION (&object_mutex);
    259. 

  259.  }
    260. 

  260.  
    261. 

  261. +__SHMEM_DEFINE_INIT(__gthread_once_t, dw2_once, __GTHREAD_ONCE_INIT)
    262. 

  262.  static void
    263. 

  263.  init_object_mutex_once (void)
    264. 

  264.  {
    265. 

  265. -  static __gthread_once_t once = __GTHREAD_ONCE_INIT;
    266. 

  266. -  __gthread_once (&once, init_object_mutex);
    267. 

  267. +  __gthread_once (&__SHMEM_GET(dw2_once), init_object_mutex);
    268. 

  268.  }
    269. 

  269.  #else
    270. 

  270.  #define init_object_mutex_once()
    271. 

  271. @@ -424,11 +428,13 @@
    272. 

  272.     chain to determine what should be placed in the ERRATIC array, and
    273. 

  273.     what is the linear sequence.  This overlay is safe from aliasing.  */
    274. 

  274.  
    275. 

  275. +__SHMEM_DEFINE(const fde *, marker)
    276. 

  276. +
    277. 

  277.  static inline void
    278. 

  278.  fde_split (struct object *ob, fde_compare_t fde_compare,
    279. 

  279.  	   struct fde_vector *linear, struct fde_vector *erratic)
    280. 

  280.  {
    281. 

  281. -  static const fde *marker;
    282. 

  282. +  #define marker __SHMEM_GET(marker)
    283. 

  283.    size_t count = linear->count;
    284. 

  284.    const fde *const *chain_end = &marker;
    285. 

  285.    size_t i, j, k;
    286. 

  286. @@ -463,6 +469,7 @@
    287. 

  287.        erratic->array[k++] = linear->array[i];
    288. 

  288.    linear->count = j;
    289. 

  289.    erratic->count = k;
    290. 

  290. +  #undef marker
    291. 

  291.  }
    292. 

  292.  
    293. 

  293.  #define SWAP(x,y) do { const fde * tmp = x; x = y; y = tmp; } while (0)
    294. 

  294. diff -r 0128c92731b8 gcc/unwind-dw2.c
    295. 

  295. --- a/gcc/unwind-dw2.c	Mon Dec 20 17:17:01 2010 -0700
    296. 

  296. +++ b/gcc/unwind-dw2.c	Tue Dec 21 20:56:42 2010 -0700
    297. 

  297. @@ -36,6 +36,7 @@
    298. 

  298.  #include "unwind-dw2-fde.h"
    299. 

  299.  #include "gthr.h"
    300. 

  300.  #include "unwind-dw2.h"
    301. 

  301. +#include "shmem.h"
    302. 

  302.  
    303. 

  303.  #ifndef __USING_SJLJ_EXCEPTIONS__
    304. 

  304.  
    305. 

  305. @@ -78,7 +79,8 @@
    306. 

  306.  };
    307. 

  307.  
    308. 

  308.  /* Byte size of every register managed by these routines.  */
    309. 

  309. -static unsigned char dwarf_reg_size_table[DWARF_FRAME_REGISTERS+1];
    310. 

  310. +__SHMEM_DEFINE_ARRAY(unsigned char, dwarf_reg_size_table, DWARF_FRAME_REGISTERS+1)
    311. 

  311. +#define dwarf_reg_size_table __SHMEM_GET_ARRAY(dwarf_reg_size_table)
    312. 

  312.  
    313. 

  313.  
    314. 

  314.  /* Read unaligned data from the instruction buffer.  */
    315. 

  315. @@ -160,7 +162,7 @@
    316. 

  316.  #endif
    317. 

  317.  
    318. 

  318.    index = DWARF_REG_TO_UNWIND_COLUMN (index);
    319. 

  319. -  gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
    320. 

  320. +  gcc_assert (index < (int) (sizeof(unsigned char) * (DWARF_FRAME_REGISTERS + 1)));
    321. 

  321.    size = dwarf_reg_size_table[index];
    322. 

  322.    ptr = context->reg[index];
    323. 

  323.  
    324. 

  324. @@ -200,7 +202,7 @@
    325. 

  325.    void *ptr;
    326. 

  326.  
    327. 

  327.    index = DWARF_REG_TO_UNWIND_COLUMN (index);
    328. 

  328. -  gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
    329. 

  329. +  gcc_assert (index < (int) (sizeof(unsigned char) * (DWARF_FRAME_REGISTERS + 1)));
    330. 

  330.    size = dwarf_reg_size_table[index];
    331. 

  331.  
    332. 

  332.    if (_Unwind_IsExtendedContext (context) && context->by_value[index])
    333. 

  333. @@ -249,7 +251,7 @@
    334. 

  334.  		    _Unwind_Word val)
    335. 

  335.  {
    336. 

  336.    index = DWARF_REG_TO_UNWIND_COLUMN (index);
    337. 

  337. -  gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
    338. 

  338. +  gcc_assert (index < (int) (sizeof(unsigned char) * (DWARF_FRAME_REGISTERS + 1)));
    339. 

  339.    gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Ptr));
    340. 

  340.  
    341. 

  341.    context->by_value[index] = 1;
    342. 

  342. @@ -1431,6 +1433,8 @@
    343. 

  343.    __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table);
    344. 

  344.  }
    345. 

  345.  
    346. 

  346. +__SHMEM_DEFINE_INIT(__gthread_once_t, once_regsizes, __GTHREAD_ONCE_INIT)
    347. 

  347. +
    348. 

  348.  static void __attribute__((noinline))
    349. 

  349.  uw_init_context_1 (struct _Unwind_Context *context,
    350. 

  350.  		   void *outer_cfa, void *outer_ra)
    351. 

  351. @@ -1449,8 +1453,7 @@
    352. 

  352.  
    353. 

  353.  #if __GTHREADS
    354. 

  354.    {
    355. 

  355. -    static __gthread_once_t once_regsizes = __GTHREAD_ONCE_INIT;
    356. 

  356. -    if (__gthread_once (&once_regsizes, init_dwarf_reg_size_table) != 0
    357. 

  357. +    if (__gthread_once (&__SHMEM_GET(once_regsizes), init_dwarf_reg_size_table) != 0
    358. 

  358.  	&& dwarf_reg_size_table[0] == 0)
    359. 

  359.        init_dwarf_reg_size_table ();
    360. 

  360.    }
    361. 

  361. diff -r 0128c92731b8 gcc/unwind-sjlj.c
    362. 

  362. --- a/gcc/unwind-sjlj.c	Mon Dec 20 17:17:01 2010 -0700
    363. 

  363. +++ b/gcc/unwind-sjlj.c	Tue Dec 21 20:56:42 2010 -0700
    364. 

  364. @@ -29,6 +29,7 @@
    365. 

  365.  #include "tm.h"
    366. 

  366.  #include "unwind.h"
    367. 

  367.  #include "gthr.h"
    368. 

  368. +#include "shmem.h"
    369. 

  369.  
    370. 

  370.  #ifdef __USING_SJLJ_EXCEPTIONS__
    371. 

  371.  
    372. 

  372. @@ -95,11 +96,14 @@
    373. 

  373.  /* Manage the chain of registered function contexts.  */
    374. 

  374.  
    375. 

  375.  /* Single threaded fallback chain.  */
    376. 

  376. -static struct SjLj_Function_Context *fc_static;
    377. 

  377. +__SHMEM_DEFINE(struct SjLj_Function_Context *, fc_static)
    378. 

  378. +#define fc_static __SHMEM_GET(fc_static)
    379. 

  379.  
    380. 

  380.  #if __GTHREADS
    381. 

  381. -static __gthread_key_t fc_key;
    382. 

  382. -static int use_fc_key = -1;
    383. 

  383. +__SHMEM_DEFINE(__gthread_key_t, fc_key)
    384. 

  384. +#define fc_key __SHMEM_GET(fc_key)
    385. 

  385. +__SHMEM_DEFINE_INIT(int, use_fc_key, -1)
    386. 

  386. +#define use_fc_key __SHMEM_GET(use_fc_key)
    387. 

  387.  
    388. 

  388.  static void
    389. 

  389.  fc_key_init (void)
    390. 

  390. @@ -107,11 +111,12 @@
    391. 

  391.    use_fc_key = __gthread_key_create (&fc_key, 0) == 0;
    392. 

  392.  }
    393. 

  393.  
    394. 

  394. +__SHMEM_DEFINE_INIT(__gthread_once_t, sjlj_once, __GTHREAD_ONCE_INIT)
    395. 

  395. +
    396. 

  396.  static void
    397. 

  397.  fc_key_init_once (void)
    398. 

  398.  {
    399. 

  399. -  static __gthread_once_t once = __GTHREAD_ONCE_INIT;
    400. 

  400. -  if (__gthread_once (&once, fc_key_init) != 0 || use_fc_key < 0)
    401. 

  401. +  if (__gthread_once (&__SHMEM_GET(sjlj_once), fc_key_init) != 0 || use_fc_key < 0)
    402. 

  402.      use_fc_key = 0;
    403. 

  403.  }
    404. 

  404.  #endif
    405. 

  405. diff -r 0128c92731b8 libgcc/Makefile.in
    406. 

  406. --- a/libgcc/Makefile.in	Mon Dec 20 17:17:01 2010 -0700
    407. 

  407. +++ b/libgcc/Makefile.in	Tue Dec 21 20:56:42 2010 -0700
    408. 

  408. @@ -719,6 +719,11 @@
    409. 

  409.  
    410. 

  410.  endif
    411. 

  411.  
    412. 

  412. +libgcc-objects += shmem-win32.o
    413. 

  413. +shmem-win32.o: $(srcdir)/../gcc/config/i386/shmem-win32.c
    414. 

  414. +	$(filter-out -fexceptions,$(gcc_compile)) \
    415. 

  415. +	 -fno-exceptions -c $(srcdir)/../gcc/config/i386/shmem-win32.c
    416. 

  416. +
    417. 

  417.  # Build LIBUNWIND.
    418. 

  418.  
    419. 

  419.  c_flags := -fexceptions
    420. 

  420. diff -r 0128c92731b8 libstdc++-v3/libsupc++/eh_globals.cc
    421. 

  421. --- a/libstdc++-v3/libsupc++/eh_globals.cc	Mon Dec 20 17:17:01 2010 -0700
    422. 

  422. +++ b/libstdc++-v3/libsupc++/eh_globals.cc	Tue Dec 21 20:56:42 2010 -0700
    423. 

  423. @@ -29,6 +29,7 @@
    424. 

  424.  #include "cxxabi.h"
    425. 

  425.  #include "unwind-cxx.h"
    426. 

  426.  #include "bits/gthr.h"
    427. 

  427. +#include "shmem.h"
    428. 

  428.  
    429. 

  429.  #if _GLIBCXX_HOSTED
    430. 

  430.  using std::free;
    431. 

  431. @@ -42,7 +43,7 @@
    432. 

  432.  
    433. 

  433.  using namespace __cxxabiv1;
    434. 

  434.  
    435. 

  435. -#if _GLIBCXX_HAVE_TLS
    436. 

  436. +#if _GLIBCXX_HAVE_TLS && !defined(__MINGW32__)
    437. 

  437.  
    438. 

  438.  namespace
    439. 

  439.  {
    440. 

  440. @@ -66,7 +67,8 @@
    441. 

  441.  #else
    442. 

  442.  
    443. 

  443.  // Single-threaded fallback buffer.
    444. 

  444. -static __cxa_eh_globals eh_globals;
    445. 

  445. +__SHMEM_DEFINE_INIT(__cxa_eh_globals, eh_globals, __cxa_eh_globals())
    446. 

  446. +#define eh_globals __SHMEM_GET(eh_globals)
    447. 

  447.  
    448. 

  448.  #if __GTHREADS
    449. 

  449.  
    450. 

  450. @@ -105,9 +107,18 @@
    451. 

  451.        __gthread_key_delete(_M_key);
    452. 

  452.      _M_init = false;
    453. 

  453.    }
    454. 

  454. +
    455. 

  455. +  __eh_globals_init& operator = (__eh_globals_init& c)
    456. 

  456. +  {
    457. 

  457. +    _M_key = c._M_key;
    458. 

  458. +    _M_init = c._M_init;
    459. 

  459. +    c._M_init = false;
    460. 

  460. +    return *this;
    461. 

  461. +  }
    462. 

  462.  };
    463. 

  463.  
    464. 

  464. -static __eh_globals_init init;
    465. 

  465. +__SHMEM_DEFINE_INIT(__eh_globals_init, init, __eh_globals_init())
    466. 

  466. +#define init __SHMEM_GET(init)
    467. 

  467.  
    468. 

  468.  extern "C" __cxa_eh_globals*
    469. 

  469.  __cxxabiv1::__cxa_get_globals_fast() throw()
    470. 

  470. diff -r 0128c92731b8 libstdc++-v3/libsupc++/eh_term_handler.cc
    471. 

  471. --- a/libstdc++-v3/libsupc++/eh_term_handler.cc	Mon Dec 20 17:17:01 2010 -0700
    472. 

  472. +++ b/libstdc++-v3/libsupc++/eh_term_handler.cc	Tue Dec 21 20:56:42 2010 -0700
    473. 

  473. @@ -24,6 +24,7 @@
    474. 

  474.  
    475. 

  475.  #include <bits/c++config.h>
    476. 

  476.  #include "unwind-cxx.h"
    477. 

  477. +#include "shmem.h"
    478. 

  478.  
    479. 

  479.  /* We default to the talkative, informative handler in a normal hosted
    480. 

  480.     library.  This pulls in the demangler, the dyn-string utilities, and
    481. 

  481. @@ -37,10 +38,11 @@
    482. 

  482.  #endif
    483. 

  483.  
    484. 

  484.  /* The current installed user handler.  */
    485. 

  485. -std::terminate_handler __cxxabiv1::__terminate_handler =
    486. 

  486. +namespace __cxxabiv1
    487. 

  487. +{
    488. 

  488.  #if _GLIBCXX_HOSTED
    489. 

  489. -	__gnu_cxx::__verbose_terminate_handler;
    490. 

  490. +  __SHMEM_DEFINE_INIT(std::terminate_handler, __terminate_handler_sh, __gnu_cxx::__verbose_terminate_handler)
    491. 

  491.  #else
    492. 

  492. -	std::abort;
    493. 

  493. +  __SHMEM_DEFINE_INIT(std::terminate_handler, __terminate_handler_sh, std::abort)
    494. 

  494.  #endif
    495. 

  495. -
    496. 

  496. +}
    497. 

  497. diff -r 0128c92731b8 libstdc++-v3/libsupc++/eh_unex_handler.cc
    498. 

  498. --- a/libstdc++-v3/libsupc++/eh_unex_handler.cc	Mon Dec 20 17:17:01 2010 -0700
    499. 

  499. +++ b/libstdc++-v3/libsupc++/eh_unex_handler.cc	Tue Dec 21 20:56:42 2010 -0700
    500. 

  500. @@ -23,7 +23,11 @@
    501. 

  501.  // <http://www.gnu.org/licenses/>.
    502. 

  502.  
    503. 

  503.  #include "unwind-cxx.h"
    504. 

  504. +#include "shmem.h"
    505. 

  505.  
    506. 

  506.  /* The current installed user handler.  */
    507. 

  507. -std::unexpected_handler __cxxabiv1::__unexpected_handler = std::terminate;
    508. 

  508. +namespace __cxxabiv1
    509. 

  509. +{
    510. 

  510. +  __SHMEM_DEFINE_INIT(std::unexpected_handler, __unexpected_handler_sh, std::terminate)
    511. 

  511. +}
    512. 

  512.  
    513. 

  513. diff -r 0128c92731b8 libstdc++-v3/libsupc++/unwind-cxx.h
    514. 

  514. --- a/libstdc++-v3/libsupc++/unwind-cxx.h	Mon Dec 20 17:17:01 2010 -0700
    515. 

  515. +++ b/libstdc++-v3/libsupc++/unwind-cxx.h	Tue Dec 21 20:56:42 2010 -0700
    516. 

  516. @@ -36,6 +36,7 @@
    517. 

  517.  #include <cstddef>
    518. 

  518.  #include "unwind.h"
    519. 

  519.  #include <bits/atomic_word.h>
    520. 

  520. +#include "shmem.h"
    521. 

  521.  
    522. 

  522.  #pragma GCC visibility push(default)
    523. 

  523.  
    524. 

  524. @@ -208,8 +209,10 @@
    525. 

  525.  extern void __unexpected(std::unexpected_handler) __attribute__((noreturn));
    526. 

  526.  
    527. 

  527.  // The current installed user handlers.
    528. 

  528. -extern std::terminate_handler __terminate_handler;
    529. 

  529. -extern std::unexpected_handler __unexpected_handler;
    530. 

  530. +__SHMEM_DECLARE(std::terminate_handler, __terminate_handler_sh)
    531. 

  531. +#define __terminate_handler __SHMEM_GET(__terminate_handler_sh)
    532. 

  532. +__SHMEM_DECLARE(std::unexpected_handler, __unexpected_handler_sh)
    533. 

  533. +#define __unexpected_handler __SHMEM_GET(__unexpected_handler_sh)
    534. 

  534.  
    535. 

  535.  // These are explicitly GNU C++ specific.
    536. 

  536.  
    537. 

  537. diff -r 0128c92731b8 libstdc++-v3/src/Makefile.in
    538. 

  538. --- a/libstdc++-v3/src/Makefile.in	Mon Dec 20 17:17:01 2010 -0700
    539. 

  539. +++ b/libstdc++-v3/src/Makefile.in	Tue Dec 21 20:56:42 2010 -0700
    540. 

  540. @@ -444,12 +444,36 @@
    541. 

  541.  
    542. 

  542.  libstdc___la_SOURCES = $(sources)
    543. 

  543.  libstdc___la_LIBADD = \
    544. 

  544. -	$(GLIBCXX_LIBS) \
    545. 

  545. +	$(GLIBCXX_LIBS)
    546. 

  546. +libstdc___la_LIBADD_STATIC = \
    547. 

  547.  	$(top_builddir)/libsupc++/libsupc++convenience.la
    548. 

  548. +libstdc___la_LIBADD_SHARED = \
    549. 

  549. +	$(top_builddir)/libsupc++/convenience-shared/libsupc++convenience.la
    550. 

  550.  
    551. 

  551.  libstdc___la_DEPENDENCIES = \
    552. 

  552. -	${version_dep} \
    553. 

  553. +	${version_dep}
    554. 

  554. +libstdc___la_DEPENDENCIES_STATIC = \
    555. 

  555.  	$(top_builddir)/libsupc++/libsupc++convenience.la
    556. 

  556. +libstdc___la_DEPENDENCIES_SHARED = \
    557. 

  557. +	$(top_builddir)/libsupc++/convenience-shared/libsupc++convenience.la
    558. 

  558. +
    559. 

  559. +$(top_builddir)/libsupc++/convenience-shared/libsupc++convenience.la: $(top_builddir)/libsupc++/libsupc++convenience.la
    560. 

  560. +	cp $(top_builddir)/libsupc++/libsupc++.la $(top_builddir)/libsupc++/libsupc++_noshared.la
    561. 

  561. +	cp $(top_builddir)/libsupc++/.libs/libsupc++.a $(top_builddir)/libsupc++/libsupc++_noshared.a
    562. 

  562. +	cp $(top_builddir)/libsupc++/libsupc++convenience.la $(top_builddir)/libsupc++/libsupc++convenience_noshared.la
    563. 

  563. +	cp $(top_builddir)/libsupc++/.libs/libsupc++convenience.a $(top_builddir)/libsupc++/libsupc++convenience_noshared.a
    564. 

  564. +	$(MAKE) -C $(top_builddir)/libsupc++ clean
    565. 

  565. +	$(MAKE) -C $(top_builddir)/libsupc++ CFLAGS="$(CFLAGS) -DSHARED" CXXFLAGS="$(CXXFLAGS) -DSHARED"
    566. 

  566. +	mkdir -p -- "$(top_builddir)/libsupc++/convenience-shared/.libs"
    567. 

  567. +	cp $(top_builddir)/libsupc++/libsupc++convenience.la $(top_builddir)/libsupc++/convenience-shared/
    568. 

  568. +	cp $(top_builddir)/libsupc++/libsupc++convenience.la $(top_builddir)/libsupc++/convenience-shared/.libs/
    569. 

  569. +	cp $(top_builddir)/libsupc++/.libs/libsupc++convenience.a $(top_builddir)/libsupc++/convenience-shared/.libs/
    570. 

  570. +	cp $(top_builddir)/libsupc++/libsupc++_noshared.la $(top_builddir)/libsupc++/libsupc++.la
    571. 

  571. +	cp $(top_builddir)/libsupc++/libsupc++_noshared.la $(top_builddir)/libsupc++/.libs/libsupc++.la
    572. 

  572. +	cp $(top_builddir)/libsupc++/libsupc++_noshared.a $(top_builddir)/libsupc++/.libs/libsupc++.a
    573. 

  573. +	cp $(top_builddir)/libsupc++/libsupc++convenience_noshared.la $(top_builddir)/libsupc++/libsupc++convenience.la
    574. 

  574. +	cp $(top_builddir)/libsupc++/libsupc++convenience_noshared.la $(top_builddir)/libsupc++/.libs/libsupc++convenience.la
    575. 

  575. +	cp $(top_builddir)/libsupc++/libsupc++convenience_noshared.a $(top_builddir)/libsupc++/.libs/libsupc++convenience.a
    576. 

  576.  
    577. 

  577.  libstdc___la_LDFLAGS = \
    578. 

  578.  	-version-info $(libtool_VERSION) ${version_arg} -lm 
    579. 

  579. @@ -573,8 +597,13 @@
    580. 

  580.  	  echo "rm -f \"$${dir}/so_locations\""; \
    581. 

  581.  	  rm -f "$${dir}/so_locations"; \
    582. 

  582.  	done
    583. 

  583. -libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 
    584. 

  584. -	$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
    585. 

  585. +libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) $(libstdc___la_DEPENDENCIES_STATIC) $(libstdc___la_DEPENDENCIES_SHARED)
    586. 

  586. +	$(LIBTOOL) --tag CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
    587. 

  587. +	  $(CXX) $(OPT_LDFLAGS) $(SECTION_LDFLAGS) -static $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ \
    588. 

  588. +	  $(libstdc___la_LDFLAGS) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(libstdc___la_LIBADD_STATIC) $(LIBS)
    589. 

  589. +	cp .libs/libstdc++.a libstdc++_noshared.a
    590. 

  590. +	$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(libstdc___la_LIBADD_SHARED) $(LIBS)
    591. 

  591. +	cp libstdc++_noshared.a .libs/libstdc++.a
    592. 

  592.  
    593. 

  593.  mostlyclean-compile:
    594. 

  594.  	-rm -f *.$(OBJEXT)
    595.