Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/dist/gcc Fix building GCC 5 with clang 4.0



details:   https://anonhg.NetBSD.org/src/rev/91d7a1e6e15c
branches:  trunk
changeset: 823989:91d7a1e6e15c
user:      sevan <sevan%NetBSD.org@localhost>
date:      Wed May 17 22:06:10 2017 +0000

description:
Fix building GCC 5 with clang 4.0
Obtained from FreeBSD ports r432958
https://svnweb.freebsd.org/ports?view=revision&revision=432958
"doesn't compile with recent versions of libc++, because it attempts to redefine abort():
/usr/include/c++/v1/functional:1398:2: error: no member named 'fancy_abort' in namespace 'std::__1'; did you mean simply 'fancy_abort'?
        _VSTD::abort();
        ^~~~~~~
/usr/include/c++/v1/__config:383:15: note: expanded from macro '_VSTD'
#define _VSTD std::_LIBCPP_NAMESPACE"

diffstat:

 external/gpl3/gcc/dist/gcc/auto-profile.c               |  2 +-
 external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c |  2 +-
 external/gpl3/gcc/dist/gcc/system.h                     |  1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r c48954470b45 -r 91d7a1e6e15c external/gpl3/gcc/dist/gcc/auto-profile.c
--- a/external/gpl3/gcc/dist/gcc/auto-profile.c Wed May 17 20:13:02 2017 +0000
+++ b/external/gpl3/gcc/dist/gcc/auto-profile.c Wed May 17 22:06:10 2017 +0000
@@ -19,11 +19,11 @@
 <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
-#include "system.h"
 
 #include <string.h>
 #include <map>
 #include <set>
+#include "system.h"
 
 #include "coretypes.h"
 #include "hash-set.h"
diff -r c48954470b45 -r 91d7a1e6e15c external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c
--- a/external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c   Wed May 17 20:13:02 2017 +0000
+++ b/external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c   Wed May 17 22:06:10 2017 +0000
@@ -38,6 +38,7 @@
 #endif
 #endif
 
+#include <map>
 #include "system.h"
 #include "coretypes.h"
 #include "hash-set.h"
@@ -75,7 +76,6 @@
 #include "tree-scalar-evolution.h"
 #include "gimple-ssa.h"
 #include "tree-into-ssa.h"
-#include <map>
 
 #ifdef HAVE_isl
 #include "graphite-poly.h"
diff -r c48954470b45 -r 91d7a1e6e15c external/gpl3/gcc/dist/gcc/system.h
--- a/external/gpl3/gcc/dist/gcc/system.h       Wed May 17 20:13:02 2017 +0000
+++ b/external/gpl3/gcc/dist/gcc/system.h       Wed May 17 22:06:10 2017 +0000
@@ -224,6 +224,7 @@
 #ifdef __cplusplus
 # include <algorithm>
 # include <cstring>
+# include <new>
 # include <utility>
 #endif
 #endif



Home | Main Index | Thread Index | Old Index