summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/i386.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fecbc49c2ed..cc8b21cf7b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-27 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/68986
+ * config/i386/i386.c (ix86_update_stack_boundary): Don't
+ change stack_alignment_needed for __tls_get_addr call.
+
2016-01-27 Segher Boessenkool <segher@kernel.crashing.org>
* config/rs6000/rs6000.c (print_operand): Rollback 's' removal.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index cfbdf0f1734..6dc1fa54e9b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -12035,11 +12035,7 @@ ix86_update_stack_boundary (void)
/* __tls_get_addr needs to be called with 16-byte aligned stack. */
if (ix86_tls_descriptor_calls_expanded_in_cfun
&& crtl->preferred_stack_boundary < 128)
- {
- crtl->preferred_stack_boundary = 128;
- if (crtl->stack_alignment_needed < 128)
- crtl->stack_alignment_needed = 128;
- }
+ crtl->preferred_stack_boundary = 128;
}
/* Handle the TARGET_GET_DRAP_RTX hook. Return NULL if no DRAP is