From 6b50f5f4cb8e36e5ecdbba5caf70c7f4ffaa03ad Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 28 Apr 2023 08:20:15 +0200 Subject: [PATCH] x86/Intel: reduce ELF/PE conditional scope in x86_cons() All the Intel syntax related state adjustments apply independent of target or object format. --- gas/config/tc-i386.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 7fdd71b490d..29b7734b1ac 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -10506,12 +10506,12 @@ x86_cons (expressionS *exp, int size) { bfd_reloc_code_real_type got_reloc = NO_RELOC; + intel_syntax = -intel_syntax; + exp->X_md = 0; + #if ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) \ && !defined (LEX_AT)) \ || defined (TE_PE) - intel_syntax = -intel_syntax; - - exp->X_md = 0; if (size == 4 || (object_64bit && size == 8)) { /* Handle @GOTOFF and the like in an expression. */ @@ -10558,15 +10558,13 @@ x86_cons (expressionS *exp, int size) } } else +#endif expression (exp); intel_syntax = -intel_syntax; if (intel_syntax) i386_intel_simplify (exp); -#else - expression (exp); -#endif /* If not 64bit, massage value, to account for wraparound when !BFD64. */ if (size == 4 && exp->X_op == O_constant && !object_64bit) -- 2.30.2