From: guenther <guenther@openbsd.org>
Date: Mon, 21 Jul 2014 01:53:12 +0000 (+0000)
Subject: printf(9) and friends don't support the <number>$ flags, so gcc's
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e8f4cb76c3bd7c92e846ee051506f0345ac322dc;p=openbsd

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 1b1734bd30f..ce50c517dcf 100644
--- 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 ee89f1edc16..3de91ff4a8b 100644
--- 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
   },