gas: fold three as_warn() in emit_expr_with_reloc()

Message ID 27fc4917-6adb-6c15-5213-3ab55bd6c6f2@suse.com
State New
Headers show
Series
  • gas: fold three as_warn() in emit_expr_with_reloc()
Related show

Commit Message

Alan Modra via Binutils June 10, 2021, 11:36 a.m.
Simply use the available abstraction instead of, effectively, trying to
open-code it.

gas/
2021-06-XX  Jan Beulich  <jbeulich@suse.com>

	* read.c (emit_expr_with_reloc): Fold three as_warn().

Comments

Alan Modra via Binutils June 11, 2021, 2:14 p.m. | #1
Hi Jan,

> gas/

> 2021-06-XX  Jan Beulich  <jbeulich@suse.com>

> 

> 	* read.c (emit_expr_with_reloc): Fold three as_warn().


Approved - please apply.

Cheers
   Nick

Patch

--- a/gas/read.c
+++ b/gas/read.c
@@ -4539,18 +4539,8 @@  emit_expr_with_reloc (expressionS *exp,
 	      || (get & hibit) == 0))
 	{
 	  /* Leading bits contain both 0s & 1s.  */
-#if defined (BFD64) && BFD_HOST_64BIT_LONG_LONG
-#ifndef __MSVCRT__
-	  as_warn (_("value 0x%llx truncated to 0x%llx"),
-		   (unsigned long long) get, (unsigned long long) use);
-#else
-	  as_warn (_("value 0x%I64x truncated to 0x%I64x"),
-		   (unsigned long long) get, (unsigned long long) use);
-#endif
-#else
-	  as_warn (_("value 0x%lx truncated to 0x%lx"),
-		   (unsigned long) get, (unsigned long) use);
-#endif
+	  as_warn (_("value 0x%" BFD_VMA_FMT "x truncated to 0x%" BFD_VMA_FMT "x"),
+		   get, use);
 	}
       /* Put bytes in right order.  */
       md_number_to_chars (p, use, (int) nbytes);