[src/trunk]: src/external/bsd/libc++/dist/libcxxrt/src Fix gcc revision check...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dcba829232a5
branches:  trunk
changeset: 339076:dcba829232a5
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jun 26 00:50:39 2015 +0000

description:
Fix gcc revision check for __cxa_begin_catch() declaration.

Now it matches what was introduced in upstream commit e426f95.

Fixes PR lib/49990 (libc++ fails to compile with g++ 5.1)

diffstat:

 external/bsd/libc++/dist/libcxxrt/src/exception.cc |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r d42a819676f8 -r dcba829232a5 external/bsd/libc++/dist/libcxxrt/src/exception.cc
--- a/external/bsd/libc++/dist/libcxxrt/src/exception.cc        Thu Jun 25 18:41:03 2015 +0000
+++ b/external/bsd/libc++/dist/libcxxrt/src/exception.cc        Fri Jun 26 00:50:39 2015 +0000
@@ -673,7 +673,7 @@
  * 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);
@@ -1189,7 +1189,7 @@
  * 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)