aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/varasm.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e97439f..54569fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-08 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ * varasm.c (emit_local): Move definition of align.
+
2015-04-08 Julian Brown <julian@codesourcery.com>
* config/nvptx/mkoffload.c (process): Support variable mapping.
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 537a64d..e644b1d 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1928,17 +1928,18 @@ assemble_string (const char *p, int size)
/* A noswitch_section_callback for lcomm_section. */
static bool
-emit_local (tree decl,
+emit_local (tree decl ATTRIBUTE_UNUSED,
const char *name ATTRIBUTE_UNUSED,
unsigned HOST_WIDE_INT size ATTRIBUTE_UNUSED,
unsigned HOST_WIDE_INT rounded ATTRIBUTE_UNUSED)
{
- int align = symtab_node::get (decl)->definition_alignment ();
#if defined ASM_OUTPUT_ALIGNED_DECL_LOCAL
+ int align = symtab_node::get (decl)->definition_alignment ();
ASM_OUTPUT_ALIGNED_DECL_LOCAL (asm_out_file, decl, name,
size, align);
return true;
#elif defined ASM_OUTPUT_ALIGNED_LOCAL
+ int align = symtab_node::get (decl)->definition_alignment ();
ASM_OUTPUT_ALIGNED_LOCAL (asm_out_file, name, size, align);
return true;
#else