Import libcxxrt master 1cb607e89f6135bbc10f3d3b6fba1f983e258dcc.

Interesting fixes:
1cb607e	Correct gcc version check for __cxa_begin_catch() declaration
	with or without throw()

MFC after:	3 days

This commit is contained in:

Dimitry Andric

2015-01-31 23:31:45 +00:00

parent 072ff34e71 1666b1da2f

commit 07122a2a31

1 changed files with 2 additions and 2 deletions

									
										contrib/libcxxrt/exception.cc
									
		+2
		-2
	
												View File
												
				@@ -673,7 +673,7 @@ static _Unwind_Reason_Code trace(struct _Unwind_Context *context, void *c)

				 * If the failure happened by falling off the end of the stack without finding

				 * a handler, prints a back trace before aborting.

				 */

				#if __GNUC__ > 3 && __GNUC_MINOR__ > 2

				#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)

				extern "C" void *__cxa_begin_catch(void *e) throw();

				#else

				extern "C" void *__cxa_begin_catch(void *e);

				@@ -1191,7 +1191,7 @@ BEGIN_PERSONALITY_FUNCTION(__gxx_personality_v0)

				 * pointer to the caught exception, which is either the adjusted pointer (for

				 * C++ exceptions) of the unadjusted pointer (for foreign exceptions).

				 */

				#if __GNUC__ > 3 && __GNUC_MINOR__ > 2

				#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)

				extern "C" void *__cxa_begin_catch(void *e) throw()

				#else

				extern "C" void *__cxa_begin_catch(void *e)