From d9e940e3516130cc23bfab1ee9d6003f35848ba0 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 24 Feb 2019 20:22:28 -0500 Subject: midipix targets: remove the wrong flag_constructor_decl logic. --- gcc/config/i386/midipix.c | 3 +-- gcc/varasm.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gcc/config/i386/midipix.c b/gcc/config/i386/midipix.c index 35bcb5088..99616aed7 100644 --- a/gcc/config/i386/midipix.c +++ b/gcc/config/i386/midipix.c @@ -578,10 +578,9 @@ bool midipix_asm_assemble_integer(rtx x, unsigned int size, int aligned_p) const char * name; const char * ptrsize; const char * rvapad; - extern int flag_constructor_decl; /* filter out c++ constructors */ - if (flag_constructor_decl || flag_assume_static_linking) + if (flag_assume_static_linking) return default_assemble_integer(x,size,aligned_p); /* xref, xoff */ diff --git a/gcc/varasm.c b/gcc/varasm.c index a6cf6a798..34890b338 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -104,9 +104,6 @@ static alias_set_type const_alias_set; static bool saw_no_split_stack; -/* whether the current symbol reference points to a constructor (element) */ -int flag_constructor_decl = 0; - static const char *strip_reg_name (const char *); static int contains_pointers_p (tree); #ifdef ASM_OUTPUT_EXTERNAL @@ -4620,9 +4617,7 @@ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align) switch (TREE_CODE (exp)) { case CONSTRUCTOR: - flag_constructor_decl++; output_constructor (exp, size, align, NULL); - flag_constructor_decl--; return; case STRING_CST: thissize = MIN ((unsigned HOST_WIDE_INT)TREE_STRING_LENGTH (exp), -- cgit v1.2.3