Don't include "params.h" if building with GCC 10

gcc-c-api/gcc-cfg.c

@@ -37,7 +37,11 @@
 #include "gimple-iterator.h"
 #endif
 
+/* gcc 10 removed this header */
+#if (GCC_VERSION < 10000)
 #include "params.h"
+#endif
+
 #include "tree.h"
 #include "diagnostic.h"
 #include "cgraph.h"

gcc-c-api/gcc-function.c

@@ -22,7 +22,12 @@
 
 /* TODO: rationalize these headers */
 #include "tree.h"
+
+/* gcc 10 removed this header */
+#if (GCC_VERSION < 10000)
 #include "params.h"
+#endif
+
 #include "tree.h"
 #include "function.h"
 #include "diagnostic.h"

gcc-c-api/gcc-gimple.c

@@ -35,7 +35,12 @@
 #include "gimple.h"
 
 #if 0
+
+/* gcc 10 removed this header */
+#if (GCC_VERSION < 10000)
 #include "params.h"
+#endif
+
 #include "cp/name-lookup.h"	/* for global_namespace */
 #include "tree.h"
 #include "diagnostic.h"

gcc-python-option.c

@@ -98,7 +98,14 @@ int PyGcc_option_is_enabled(enum opt_code opt_code)
 {
     /* Returns 1 if option OPT_IDX is enabled in OPTS, 0 if it is disabled,
        or -1 if it isn't a simple on-off switch.  */
+#if (GCC_VERSION < 10000)
     int i = option_enabled (opt_code, global_dc->option_state);
+#else
+    /* Starting with GCC 10, options can be distinguished by language. */
+    /* TODO Expose the lang_mask to the user. */
+    int i = option_enabled (opt_code, CL_LANG_ALL, global_dc->option_state);
+#endif
+
     if (i == 1) {
         return 1;
     }

gcc-python-parameter.c

@@ -17,10 +17,15 @@
    <http://www.gnu.org/licenses/>.
 */
 
+
+
 #include <Python.h>
 #include "gcc-python.h"
 #include "gcc-python-wrappers.h"
 
+/* gcc 10 removed params.h */
+#if (GCC_VERSION < 10000)
+
 /*
   Wrapper for GCC's params.h.
   We specifically wrap "compiler_param" (a typedef to an enum)
@@ -50,6 +55,8 @@ PyGcc_WrtpMarkForPyGccParameter(PyGccParameter *wrapper)
     /* empty */
 }
 
+#endif
+
 /*
   PEP-7
 Local variables:

gcc-python.c

@@ -225,6 +225,8 @@ PyGcc_get_option_dict(PyObject *self, PyObject *args)
     return dict;
 }
 
+/* Function has been removed from GCC 10. */
+#if (GCC_VERSION < 10000)
 static PyObject *
 PyGcc_get_parameters(PyObject *self, PyObject *args)
 {
@@ -256,6 +258,7 @@ PyGcc_get_parameters(PyObject *self, PyObject *args)
     Py_XDECREF(dict);
     return NULL;
 }
+#endif
 
 IMPL_APPENDER(add_var_to_list,
               gcc_variable,
@@ -452,9 +455,12 @@ static PyMethodDef GccMethods[] = {
      ("Get all command-line options, as a dict from command-line text strings "
       "to gcc.Option instances")},
 
+/* Function has been removed from GCC 10. */
+#if (GCC_VERSION < 10000)
     {"get_parameters", PyGcc_get_parameters, METH_NOARGS,
      "Get all tunable GCC parameters.  Returns a dictionary, mapping from"
      "option name -> gcc.Parameter instance"},
+#endif
 
     {"get_variables", PyGcc_get_variables, METH_NOARGS,
      "Get all variables in this compilation unit as a list of gcc.Variable"},
@@ -811,7 +817,9 @@ plugin_init (struct plugin_name_args *plugin_info,
     autogenerated_gimple_init_types();  /* FIXME: error checking! */
     autogenerated_location_init_types();  /* FIXME: error checking! */
     autogenerated_option_init_types();  /* FIXME: error checking! */
+#if (GCC_VERSION < 10000)
     autogenerated_parameter_init_types();  /* FIXME: error checking! */
+#endif
     autogenerated_pass_init_types();  /* FIXME: error checking! */
     autogenerated_pretty_printer_init_types();  /* FIXME: error checking! */
     autogenerated_rtl_init_types(); /* FIXME: error checking! */
@@ -826,7 +834,9 @@ plugin_init (struct plugin_name_args *plugin_info,
     autogenerated_gimple_add_types(PyGcc_globals.module);
     autogenerated_location_add_types(PyGcc_globals.module);
     autogenerated_option_add_types(PyGcc_globals.module);
+#if (GCC_VERSION < 10000)
     autogenerated_parameter_add_types(PyGcc_globals.module);
+#endif
     autogenerated_pass_add_types(PyGcc_globals.module);
     autogenerated_pretty_printer_add_types(PyGcc_globals.module);
     autogenerated_rtl_add_types(PyGcc_globals.module);

gcc-python.h

@@ -36,7 +36,12 @@
 #endif
 #include "gimple.h"
 
+
+/* gcc 10 removed this header */
+#if (GCC_VERSION < 10000)
 #include "params.h"
+#endif
+
 #endif
 #include "gcc-c-api/gcc-cfg.h"
 
@@ -226,10 +231,13 @@ DECLARE_SIMPLE_WRAPPER(PyGccOption,
                        option,
                        gcc_option, opt)
 
+/* gcc 10 removed params.h */
+#if (GCC_VERSION < 10000)
 DECLARE_SIMPLE_WRAPPER(PyGccParameter,
 		       PyGccParameter_TypeObj,
                        param_num,
 		       compiler_param, param_num)
+#endif
 
 DECLARE_SIMPLE_WRAPPER(PyGccRtl,
                        PyGccRtl_TypeObj,
@@ -276,9 +284,12 @@ void autogenerated_location_add_types(PyObject *m);
 int autogenerated_option_init_types(void);
 void autogenerated_option_add_types(PyObject *m);
 
+/* GCC 10 removed params.h */
+#if (GCC_VERSION < 10000)
 /* autogenerated-parameter.c */
 int autogenerated_parameter_init_types(void);
 void autogenerated_parameter_add_types(PyObject *m);
+#endif
 
 /* autogenerated-pass.c */
 int autogenerated_pass_init_types(void);

generate-parameter-c.py

@@ -17,6 +17,17 @@
 
 from cpybuilder import *
 from wrapperbuilder import PyGccWrapperTypeObject
+import os, subprocess, sys
+
+if not os.path.exists("./print-gcc-version"):
+    sys.stderr.write("Build make target 'print-gcc-version' before running this script.")
+    sys.exit(1)
+
+gcc_version = int(subprocess.check_output("./print-gcc-version"))
+
+if gcc_version >= 10000:
+    print("/* GCC10 has removed params.h; no need for this wrapper. */")
+    sys.exit(0)
 
 cu = CompilationUnit()
 cu.add_include('gcc-python.h')