svn commit: r278016 - head/contrib/libcxxrt

[Dimitry Andric]

Author: dim
Date: Sat Jan 31 23:31:45 2015
New Revision: 278016
URL: https://svnweb.freebsd.org/changeset/base/278016

Log:
  Import libcxxrt master 1cb607e89f6135bbc10f3d3b6fba1f983e258dcc.
  
  Interesting fixes:
  1cb607e	Correct gcc version check for __cxa_begin_catch() declaration
  	with or without throw()
  
  MFC after:	3 days

Modified:
  head/contrib/libcxxrt/exception.cc
Directory Properties:
  head/contrib/libcxxrt/   (props changed)

Modified: head/contrib/libcxxrt/exception.cc
==============================================================================
--- head/contrib/libcxxrt/exception.cc	Sat Jan 31 23:24:25 2015	(r278015)
+++ head/contrib/libcxxrt/exception.cc	Sat Jan 31 23:31:45 2015	(r278016)
@@ -673,7 +673,7 @@ static _Unwind_Reason_Code trace(struct 
  * 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_persona
  * 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)