gas/gen-sframe: avoid gcc extension using __VA_ARGS__

We shouldn't be using extensions when we don't have a suitable fallback in
place. Introducing a format-argument-less counterpart macro would feel a
little odd here. Instead make the sole use site have a (fake) argument
(the non-translatable part of the string).

diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 96964c13508a2b1b0a4322f9d398a64170e066ba..44124807416e2841c4a03a7e59812ebac2d8f0df 100644 (file)
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -2622,7 +2622,7 @@ cfi_finish (void)
 #endif
        /* Avoid erroring with DEFAULT_SFRAME for non-default options, like
           -32 on x86_64.  */
-       sframe_as_bad (_(".sframe not supported for target"));
+       sframe_as_bad ("%s", _(".sframe not supported for target"));
     }
 
   if ((all_cfi_sections & CFI_EMIT_debug_frame) != 0)

diff --git a/gas/gen-sframe.h b/gas/gen-sframe.h
index d5cad324da6cdca118be075c82603202336b38bf..21ca29b7c6d2bdf98835825f9a461f64a5d9beef 100644 (file)
--- a/gas/gen-sframe.h
+++ b/gas/gen-sframe.h
@@ -28,7 +28,7 @@
 #define sframe_as_bad(format, ...) \
   do {                                        \
     if (flag_gen_sframe == GEN_SFRAME_ENABLED) \
-      as_bad (format, ##__VA_ARGS__);         \
+      as_bad (format, __VA_ARGS__);            \
   } while (0)
 
 #define SFRAME_FRE_ELEM_LOC_REG                0