blob: 7383ee15ba44fa15eccc6be3e4eaefc39133699f (
plain) (
tree)
|
|
diff -ru scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h
--- scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h 2017-08-15 14:46:27.353875030 +0200
+++ scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h 2017-08-15 14:52:18.458118812 +0200
@@ -27,6 +27,11 @@
DECL_SECTION_NAME( decl ) = build_string( strlen( section ), section )
#endif
+#if SCOREP_GCC_PLUGIN_TARGET_VERSION < 7000
+#define SET_DECL_ALIGN( decl, align ) \
+ DECL_ALIGN( decl ) = ( align )
+#endif
+
#if SCOREP_GCC_PLUGIN_TARGET_VERSION >= 5000
#define varpool_finalize_decl( decl ) varpool_node::finalize_decl( decl )
#define cgraph_get_node( decl ) cgraph_node::get( decl )
diff -ru scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c
--- scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c 2017-08-15 14:46:27.353875030 +0200
+++ scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c 2017-08-15 14:52:56.220854113 +0200
@@ -194,7 +194,7 @@
TREE_TYPE( region_descr_value ) );
/* Align the struct generously, so that it works for 32 and 64 bit */
- DECL_ALIGN( region_descr_var ) = 64 * BITS_PER_UNIT;
+ SET_DECL_ALIGN( region_descr_var, 64 * BITS_PER_UNIT );
DECL_USER_ALIGN( region_descr_var ) = 1;
/* The struct is 64 bytes, because of reserved entries */
diff -ru scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h
--- scorep-3.1.orig/src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h 2017-08-15 14:46:27.353875030 +0200
+++ scorep-3.1/src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h 2017-08-15 14:49:26.163888408 +0200
@@ -23,6 +23,11 @@
#include "stringpool.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
+
+#if SCOREP_GCC_PLUGIN_TARGET_VERSION >= 7000
+#include "tree-vrp.h"
+#endif
+
#include "tree-ssanames.h"
#include "internal-fn.h"
#include "gimple-expr.h"
|
