Module Name: src
Committed By: pooka
Date: Fri Jun 26 00:50:39 UTC 2015
Modified Files:
src/external/bsd/libc++/dist/libcxxrt/src: exception.cc
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/libc++/dist/libcxxrt/src/exception.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libc++/dist/libcxxrt/src/exception.cc
diff -u src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.1.1.4 src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.2
--- src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.1.1.4 Thu May 15 23:56:01 2014
+++ src/external/bsd/libc++/dist/libcxxrt/src/exception.cc Fri Jun 26 00:50:39 2015
@@ -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);
@@ -1189,7 +1189,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)
