d59752eb01
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/annobin.git#44aadc55ffebb040c4e532cdadcae3817309f8f4
37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
--- a/gcc-plugin/annobin.cc 2020-12-02 11:59:10.000000000 +0100
|
|
+++ b/gcc-plugin/annobin.cc 2020-12-06 11:44:44.446266880 +0100
|
|
@@ -752,12 +752,12 @@ annobin_get_str_option_by_name (const ch
|
|
#if GCCPLUGIN_VERSION_MAJOR >= 11
|
|
/* GCC version 11 introduced the cl_vars array which provides offsets for
|
|
fields in global_options which are not handled by cl_options. */
|
|
- struct cl_var * var = cl_vars;
|
|
+ const struct cl_var * var = cl_vars;
|
|
|
|
- for (var = cl_vars; var->name != NULL; var ++)
|
|
- if (strmp (var->name, name) == 0)
|
|
+ for (var = cl_vars; var->var_name != NULL; var ++)
|
|
+ if (strcmp (var->var_name, name) == 0)
|
|
// FIXME: Cache the result ?
|
|
- return (const char *) (* (const char **) (((char *) annobin_global_options) + var->var_offset));
|
|
+ return * (const char **) (((char *) annobin_global_options) + var->var_offset);
|
|
|
|
annobin_inform (INFORM_VERBOSE, "WARN: gcc variable '%s' not found within cl_vars array", name);
|
|
#endif
|
|
@@ -772,12 +772,12 @@ annobin_get_int_option_by_name (const ch
|
|
#if GCCPLUGIN_VERSION_MAJOR >= 11
|
|
/* GCC version 11 introduced the cl_vars array which provides offsets for
|
|
fields in global_options which are not handled by cl_options. */
|
|
- struct cl_var * var = cl_vars;
|
|
+ const struct cl_var * var = cl_vars;
|
|
|
|
- for (var = cl_vars; var->name != NULL; var ++)
|
|
- if (strmp (var->name, name) == 0)
|
|
+ for (var = cl_vars; var->var_name != NULL; var ++)
|
|
+ if (strcmp (var->var_name, name) == 0)
|
|
// FIXME: Cache the result ?
|
|
- return (const int) (* (const int **) (((char *) annobin_global_options) + var->var_offset));
|
|
+ return * (int *) (((char *) annobin_global_options) + var->var_offset);
|
|
|
|
annobin_inform (INFORM_VERBOSE, "WARN: gcc variable '%s' not found within cl_vars array", name);
|
|
#endif
|