diff options
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/misc.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6e2e7b14a99..4d802d20b1a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2015-12-17 Pierre-Marie de Rodat <derodat@adacore.com> + + * gcc-interface/misc.c (gnat_encodings): Undefine macro and + declare a global variable. + (gnat_post_options): Initialize this global from options. + 2015-12-10 Eric Botcazou <ebotcazou@adacore.com> PR ada/48013 diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 2a651427865..ef0fe3f0daf 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -68,7 +68,8 @@ extern const char **gnat_argv; /* Ada code requires variables for these settings rather than elements of the global_options structure because they are imported. */ -int gnat_encodings = 0; +#undef gnat_encodings +enum dwarf_gnat_encodings gnat_encodings = DWARF_GNAT_ENCODINGS_DEFAULT; #undef optimize int optimize; @@ -276,6 +277,7 @@ gnat_post_options (const char **pfilename ATTRIBUTE_UNUSED) "supported anymore"); /* Copy global settings to local versions. */ + gnat_encodings = global_options.x_gnat_encodings; optimize = global_options.x_optimize; optimize_size = global_options.x_optimize_size; flag_compare_debug = global_options.x_flag_compare_debug; |