Enable cross-version compiling

Rename GCC_VERSION to TARGET_GCC_VERSION in source files.  Add a command
line preprocessor definition setting TARGET_GCC_VERSION to the value of
the file autogenerated-gcc-version, which contains the effective
GCC_VERSION of TARGET_GCC.

Author: Kevin Pyle

Makefile

@@ -169,7 +169,7 @@ $(PLUGIN_DSO): $(PLUGIN_OBJECT_FILES) $(LIBGCC_C_API_SO)
 	)
 
 .PHONY: gcc-c-api/phony-stamp-gcc-api
-gcc-c-api/phony-stamp-gcc-api: autogenerated-EXTRA_CFLAGS.txt
+gcc-c-api/phony-stamp-gcc-api: autogenerated-EXTRA_CFLAGS.txt autogenerated-gcc-version
 	$(MAKE) -C gcc-c-api libgcc-c-api.so CC="$(CC)" CXX="$(CXX)" TARGET_GCC="$(TARGET_GCC)"
 
 $(LIBGCC_C_API_SO): gcc-c-api/phony-stamp-gcc-api
@@ -178,8 +178,8 @@ $(PLUGIN_OBJECT_GENERATED_FILES): CPPFLAGS+= $(if $(srcdir),-I$(srcdir))
 
 # This is the standard .c->.o recipe, but it needs to be stated
 # explicitly to support the case that $(srcdir) is not blank.
-$(PLUGIN_OBJECT_SOURCE_FILES) $(PLUGIN_OBJECT_GENERATED_FILES): %.o: $(srcdir)%.c autogenerated-config.h $(srcdir)gcc-python.h $(LIBGCC_C_API_SO) autogenerated-EXTRA_CFLAGS.txt
-	$(call run-cc,$< $(OUTPUT_OPTION),$(COMPILE.c),$(COMPILE.cpp))
+$(PLUGIN_OBJECT_SOURCE_FILES) $(PLUGIN_OBJECT_GENERATED_FILES): %.o: $(srcdir)%.c autogenerated-config.h $(srcdir)gcc-python.h $(LIBGCC_C_API_SO) autogenerated-EXTRA_CFLAGS.txt autogenerated-gcc-version
+	read gcc_version < autogenerated-gcc-version || exit 1; $(call run-cc,-DTARGET_GCC_VERSION="$$gcc_version" $< $(OUTPUT_OPTION),$(COMPILE.c),$(COMPILE.cpp))
 
 # Use a long variable name to avoid unwanted matches.  Add an explicit
 # -x c since gcc requires a language specifier when processing stdin.

gcc-c-api/Makefile

@@ -104,8 +104,8 @@ $(LIBGCC_C_API_SO): $(OBJECT_FILES)
 
 # This is the standard .c->.o recipe, but it needs to be stated
 # explicitly to support the case that $(srcdir) is not blank.
-$(OBJECT_FILES): %.o: $(srcdir)%.c $(GENERATED_HEADERS) ../autogenerated-EXTRA_CFLAGS.txt
-	$(call run-cc,$< $(OUTPUT_OPTION),$(COMPILE.c),$(COMPILE.cpp))
+$(OBJECT_FILES): %.o: $(srcdir)%.c $(GENERATED_HEADERS) ../autogenerated-EXTRA_CFLAGS.txt ../autogenerated-gcc-version
+	read gcc_version < ../autogenerated-gcc-version || exit 1; $(call run-cc,-DTARGET_GCC_VERSION="$$gcc_version" $< $(OUTPUT_OPTION),$(COMPILE.c),$(COMPILE.cpp))
 
 autogenerated-casts.c: $(SOURCE_XML) xmltypes.py generate-casts-c.py
 	$(PYTHON) generate-casts-c.py $@

gcc-c-api/gcc-callgraph.c

@@ -38,7 +38,7 @@ GCC_PUBLIC_API (void) gcc_cgraph_node_mark_in_use (gcc_cgraph_node node)
   /* As of gcc 4.9, a cgraph_node inherits from symtab node and uses that
      struct's marking routine.
   */
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
   gt_ggc_mx_symtab_node (node.inner);
 #else
   gt_ggc_mx_cgraph_node (node.inner);
@@ -58,11 +58,11 @@ gcc_cgraph_node_get_decl (gcc_cgraph_node node)
   */
   tree decl;
 
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
   /* Access decl field of parent class, symtab_node */
   decl = node.inner->decl;
 #else
-#  if (GCC_VERSION >= 4008)
+#  if (TARGET_GCC_VERSION >= 4008)
   decl = node.inner->symbol.decl;
 #  else
   decl = node.inner->decl;
@@ -153,7 +153,7 @@ gcc_for_each_cgraph_node (bool (*cb) (gcc_cgraph_node node, void *user_data),
     gcc 4.8 eliminated: extern GTY(()) struct cgraph_node *cgraph_nodes;
     FIXME: does this only visit *defined* functions then?
   */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
   FOR_EACH_DEFINED_FUNCTION(node)
 #else
   for (node = cgraph_nodes; node; node = node->next)

gcc-c-api/gcc-cfg.c

@@ -23,7 +23,7 @@
 #include "function.h"
 #include "basic-block.h"
 
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
 #include "tree-ssa-alias.h" /* needed by gimple.h in 4.9 */
 #include "internal-fn.h" /* needed by gimple.h in 4.9 */
 #include "is-a.h" /* needed by gimple.h in 4.9 */
@@ -33,7 +33,7 @@
 #include "gimple.h"
 
 /* gcc 4.9 moved gimple_stmt_iterator into this header */
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
 #include "gimple-iterator.h"
 #endif
 
@@ -118,7 +118,7 @@ gcc_cfg_block_get_index (gcc_cfg_block block)
 
 static bool
 for_each_edge (
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
                vec<edge, va_gc> *vec_edges,
 #else
                VEC (edge, gc) * vec_edges,
@@ -174,7 +174,7 @@ checked_get_gimple_info(gcc_cfg_block block)
       return NULL;
     }
 
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
   return &block.inner->il.gimple;
 #else
   return block.inner->il.gimple;

gcc-c-api/gcc-gimple.c

@@ -24,7 +24,7 @@
 #include "tree.h"
 #include "function.h"
 #include "basic-block.h"
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
 //#include "alias.h" /* needed by tree-ssa-alias.h in 4.9 */
 #include "tree-ssa-alias.h" /* needed by gimple.h in 4.9 */
 #include "internal-fn.h" /* needed by gimple.h in 4.9 */
@@ -52,7 +52,7 @@ GCC_IMPLEMENT_PUBLIC_API (void) gcc_gimple_mark_in_use (gcc_gimple stmt)
   /* Mark the underlying object (recursing into its fields): */
 
   /* GCC 4.9 converted gimple to a class hierarchy */
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
   gt_ggc_mx_gimple_statement_base (stmt.inner);
 #else
   gt_ggc_mx_gimple_statement_d (stmt.inner);

gcc-c-api/gcc-private-compat.h

@@ -27,7 +27,7 @@
  *************************************************************************/
 
 /* Getting the length of a vector, returning 0 if it is NULL: */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
   #define GCC_COMPAT_VEC_LENGTH(KIND, V) \
     ( (V) ? ( (V)->length() ) : 0 )
 #else
@@ -36,7 +36,7 @@
 #endif
 
 /* Looking up an element by index: */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
   #define GCC_COMPAT_VEC_INDEX(KIND, V, IDX) \
     ( (*(V))[IDX] )
 #else
@@ -46,7 +46,7 @@
 
 /* Iterating over every element in a vector, or not at all if it is
    NULL: */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
   #define GCC_COMPAT_FOR_EACH_VEC_ELT(KIND, V, IDX_VAR, ITEM_VAR) \
     if ( (V) != NULL ) \
       FOR_EACH_VEC_ELT ( (*V), (IDX_VAR), (ITEM_VAR) )

gcc-c-api/gcc-variable.c

@@ -40,10 +40,10 @@ GCC_IMPLEMENT_PUBLIC_API (void) gcc_variable_mark_in_use (gcc_variable var)
   /* In GCC 4.8, struct varpool_node became part of union symtab_node_def, and
      In GCC 4.9, union symtab_node_def became class symtab_node.
   */
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
   gt_ggc_mx_symtab_node (var.inner);
 #else
-#  if (GCC_VERSION >= 4008)
+#  if (TARGET_GCC_VERSION >= 4008)
   gt_ggc_mx_symtab_node_def (var.inner);
 #  else
   gt_ggc_mx_varpool_node (var.inner);
@@ -63,11 +63,11 @@ GCC_IMPLEMENT_PUBLIC_API (gcc_tree) gcc_variable_get_decl (gcc_variable var)
   */
   tree decl;
 
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
   /* Get from base class */
   decl = var.inner->decl;
 #else
-#  if (GCC_VERSION >= 4008)
+#  if (TARGET_GCC_VERSION >= 4008)
   decl = var.inner->symbol.decl;
 #  else
   decl = var.inner->decl;

gcc-python-attribute.c

@@ -25,7 +25,7 @@
 #include "diagnostic.h"
 #include "plugin.h"
 
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
 /* GCC 4.9 moved debug_tree here: */
 #include "print-tree.h"
 #endif

gcc-python-cfg.c

@@ -432,7 +432,7 @@ PyGccCfg_get_block_for_label(PyObject *s, PyObject *args)
     if (uid < 0 ||
         (
          (
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
           vec_safe_length(self->cfg.inner->x_label_to_block_map)
 #else
           VEC_length (basic_block, self->cfg.inner->x_label_to_block_map)

gcc-python-gimple.c

@@ -26,7 +26,7 @@
 
 /* gimple_phi_arg_def etc were in tree-flow-inline.h prior to 4.9, when they
    moved to gimple.h  */
-#if (GCC_VERSION < 4009)
+#if (TARGET_GCC_VERSION < 4009)
 #include "tree-flow.h"
 #include "tree-flow-inline.h"
 #endif
@@ -35,15 +35,15 @@
    Needed for pp_gimple_stmt_1 for gcc 4.8+;
    this header didn't exist in gcc 4.6:
  */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
 #include "gimple-pretty-print.h"
 #endif
 
 #include "gcc-c-api/gcc-gimple.h"
 
 /* GCC 4.9 moved struct walk_stmt_info into the new header gimple-walk.h,
    which in turn needs the new header gimple-iterator.h: */
-#if (GCC_VERSION >= 4009)
+#if (TARGET_GCC_VERSION >= 4009)
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
 #endif
@@ -109,7 +109,7 @@ do_pretty_print(struct PyGccGimple * self, int spc, int flags)
       gcc 4.8 renamed "dump_gimple_stmt" to "pp_gimple_stmt_1"
       (in r191884).  Declaration is in gimple-pretty-print.h
     */
-#if (GCC_VERSION >= 4008)
+#if (TARGET_GCC_VERSION >= 4008)
     pp_gimple_stmt_1(PyGccPrettyPrinter_as_pp(ppobj),
                      self->stmt.inner,
                      spc, flags);