aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/varasm.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4244a98..9e4c9b3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * varasm.c (assemble_start_function): Wrap align_log definition in
+ ASM_OUTPUT_MAX_SKIP_ALIGN.
+
2016-11-24 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.md (wide AND insn to QImode splitter): Use
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 54e06acd..1e7c2b5 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1791,7 +1791,9 @@ assemble_start_function (tree decl, const char *fnname)
&& align_functions_log > align
&& optimize_function_for_speed_p (cfun))
{
+#ifdef ASM_OUTPUT_MAX_SKIP_ALIGN
int align_log = align_functions_log;
+#endif
int max_skip = align_functions - 1;
if (flag_limit_function_alignment && crtl->max_insn_address > 0
&& max_skip >= crtl->max_insn_address)