aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Meyer <cem@FreeBSD.org>2016-05-27 03:40:52 +0000
committerConrad Meyer <cem@FreeBSD.org>2016-05-27 03:40:52 +0000
commit2844d30cc50e8788f218bb179a970888710c686f (patch)
treeb5a90f140a9f130f4c515243c8810aca11bfe586
parentb38b13d889232acc97e45fd4708deb16c912284d (diff)
Notes
-rw-r--r--contrib/gcc/c-decl.c12
-rw-r--r--gnu/usr.bin/cc/cc_tools/freebsd-native.h2
2 files changed, 4 insertions, 10 deletions
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index 0f23ee3f09cbd..53f6ee054e469 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -3150,20 +3150,14 @@ build_array_declarator (tree expr, struct c_declspecs *quals, bool static_p,
/* Set the contained declarator of an array declarator. DECL is the
declarator, as constructed by build_array_declarator; INNER is what
- appears on the left of the []. ABSTRACT_P is true if it is an
- abstract declarator, false otherwise; this is used to reject static
- and type qualifiers in abstract declarators, where they are not in
- the C99 grammar (subject to possible change in DR#289). */
+ appears on the left of the []. */
struct c_declarator *
set_array_declarator_inner (struct c_declarator *decl,
- struct c_declarator *inner, bool abstract_p)
+ struct c_declarator *inner,
+ bool abstract_p __attribute__ ((__unused__)))
{
decl->declarator = inner;
- if (abstract_p && (decl->u.array.quals != TYPE_UNQUALIFIED
- || decl->u.array.attrs != NULL_TREE
- || decl->u.array.static_p))
- error ("static or type qualifiers in abstract declarator");
return decl;
}
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 9bf790ffb6ace..bd3ce1e9e4a11 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -8,7 +8,7 @@
/* Fake out gcc/config/freebsd<version>.h. */
#define FBSD_MAJOR 11
-#define FBSD_CC_VER 1100001 /* form like __FreeBSD_version */
+#define FBSD_CC_VER 1100002 /* form like __FreeBSD_version */
#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */
#undef TOOL_INCLUDE_DIR /* We don't need one for now. */