diff options
| author | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-08-17 19:37:06 +0000 |
|---|---|---|
| committer | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-08-17 19:37:06 +0000 |
| commit | 1b7a126b279d60a23e11baeb7431583b784157db (patch) | |
| tree | 5cc20c0c1ed82a1c08c4381a6bb4691aecdd0afc | |
| parent | 91215b2674c0c51f649dbe1dea7bc27d14d33a6f (diff) | |
| download | gcc-1b7a126b279d60a23e11baeb7431583b784157db.tar.gz | |
Backport from mainline
2017-08-17 Maxim Ostapenko <m.ostapenko@samsung.com>
PR target/81861
* config/i386/i386.c (ix86_option_override_internal): Save target
specific options after ix86_stack_protector_guard_reg was changed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@251162 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f3a23107eb0..ab60c7861d8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-08-17 Uros Bizjak <ubizjak@gmail.com> + + Backport from mainline + 2017-08-17 Maxim Ostapenko <m.ostapenko@samsung.com> + + PR target/81861 + * config/i386/i386.c (ix86_option_override_internal): Save target + specific options after ix86_stack_protector_guard_reg was changed. + 2017-08-16 Bill Schmidt <wschmidt@linux.vnet.ibm.com> Backport from mainline diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index dc14d205de7..5a31c72ff91 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6288,12 +6288,6 @@ ix86_option_override_internal (bool main_args_p, gcc_assert ((opts->x_target_flags & MASK_LONG_DOUBLE_64) == 0 || (opts->x_target_flags & MASK_LONG_DOUBLE_128) == 0); - /* Save the initial options in case the user does function specific - options. */ - if (main_args_p) - target_option_default_node = target_option_current_node - = build_target_option_node (opts); - /* Handle stack protector */ if (!opts_set->x_ix86_stack_protector_guard) opts->x_ix86_stack_protector_guard @@ -6314,6 +6308,12 @@ ix86_option_override_internal (bool main_args_p, free (str); } + /* Save the initial options in case the user does function specific + options. */ + if (main_args_p) + target_option_default_node = target_option_current_node + = build_target_option_node (opts); + return true; } |