printf(9) and friends don't support the <number>$ flags, so gcc's

kprintf attribute shouldn't accept them.

ok martynas@

diff --git a/gnu/gcc/gcc/c-format.c b/gnu/gcc/gcc/c-format.c
index 1b1734b..ce50c51 100644 (file)
--- a/gnu/gcc/gcc/c-format.c
+++ b/gnu/gcc/gcc/c-format.c
@@ -771,7 +771,7 @@ static const format_kind_info format_types_orig[] =
   },
   { "kprintf",   kprintf_length_specs,  kprint_char_table, " +#0-'I", NULL,  
     printf_flag_specs, printf_flag_pairs, 
-    FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK, 
+    FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK, 
     'w', 0, 'p', 0, 'L', 
     &integer_type_node, &integer_type_node 
   }, 

diff --git a/gnu/usr.bin/gcc/gcc/c-format.c b/gnu/usr.bin/gcc/gcc/c-format.c
index ee89f1e..3de91ff 100644 (file)
--- a/gnu/usr.bin/gcc/gcc/c-format.c
+++ b/gnu/usr.bin/gcc/gcc/c-format.c
@@ -890,7 +890,7 @@ static const format_kind_info format_types[] =
   },
   { "kprintf",   kprintf_length_specs,  kprint_char_table, " +#0-'I", NULL, 
     printf_flag_specs, printf_flag_pairs,
-    FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+    FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
     'w', 0, 'p', 0, 'L',
     &integer_type_node, &integer_type_node
   },