summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2014-07-21 01:53:12 +0000
committerguenther <guenther@openbsd.org>2014-07-21 01:53:12 +0000
commite8f4cb76c3bd7c92e846ee051506f0345ac322dc (patch)
treefbf8ca5f45262f446dcc3c491ff4e6a83c20a041
parentSwitch from <sys/endian.h> or <machine/endian.h> to the new, (diff)
downloadwireguard-openbsd-e8f4cb76c3bd7c92e846ee051506f0345ac322dc.tar.xz
wireguard-openbsd-e8f4cb76c3bd7c92e846ee051506f0345ac322dc.zip
printf(9) and friends don't support the <number>$ flags, so gcc's
kprintf attribute shouldn't accept them. ok martynas@
-rw-r--r--gnu/gcc/gcc/c-format.c2
-rw-r--r--gnu/usr.bin/gcc/gcc/c-format.c2
2 files changed, 2 insertions, 2 deletions
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
},