From 9a265c974cd85b8eae5ea607185e689f063db4a1 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 13 Nov 2022 12:58:49 +0000 Subject: [PATCH] ginclude: C2x header version macros C2x adds __STDC_VERSION_*_H__ macros to individual headers with interface changes compared to C17. All the new header features in headers provided by GCC have now been implemented, so define those macros to the value given in the current working draft. Bootstrapped with no regressions for x86_64-pc-linux-gnu. gcc/ * ginclude/float.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_FLOAT_H__): New macro. * ginclude/stdarg.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_STDARG_H__): New macro. * ginclude/stdatomic.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_STDATOMIC_H__): New macro. * ginclude/stddef.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_STDDEF_H__): New macro. * ginclude/stdint-gcc.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_STDINT_H__): New macro. * glimits.h [__STDC_VERSION__ > 201710L] (__STDC_VERSION_LIMITS_H__): New macro. gcc/testsuite/ * gcc.dg/c11-float-8.c, gcc.dg/c11-limits-1.c, gcc.dg/c11-stdarg-4.c, gcc.dg/c11-stdatomic-3.c, gcc.dg/c11-stddef-1.c, gcc.dg/c11-stdint-1.c, gcc.dg/c2x-float-13.c, gcc.dg/c2x-limits-1.c, gcc.dg/c2x-stdarg-5.c, gcc.dg/c2x-stdatomic-1.c, gcc.dg/c2x-stddef-1.c, gcc.dg/c2x-stdint-1.c: New tests. --- gcc/ginclude/float.h | 4 ++++ gcc/ginclude/stdarg.h | 4 ++++ gcc/ginclude/stdatomic.h | 4 ++++ gcc/ginclude/stddef.h | 1 + gcc/ginclude/stdint-gcc.h | 4 ++++ gcc/glimits.h | 2 ++ gcc/testsuite/gcc.dg/c11-float-8.c | 9 +++++++++ gcc/testsuite/gcc.dg/c11-limits-1.c | 9 +++++++++ gcc/testsuite/gcc.dg/c11-stdarg-4.c | 9 +++++++++ gcc/testsuite/gcc.dg/c11-stdatomic-3.c | 9 +++++++++ gcc/testsuite/gcc.dg/c11-stddef-1.c | 9 +++++++++ gcc/testsuite/gcc.dg/c11-stdint-1.c | 9 +++++++++ gcc/testsuite/gcc.dg/c2x-float-13.c | 13 +++++++++++++ gcc/testsuite/gcc.dg/c2x-limits-1.c | 13 +++++++++++++ gcc/testsuite/gcc.dg/c2x-stdarg-5.c | 13 +++++++++++++ gcc/testsuite/gcc.dg/c2x-stdatomic-1.c | 13 +++++++++++++ gcc/testsuite/gcc.dg/c2x-stddef-1.c | 13 +++++++++++++ gcc/testsuite/gcc.dg/c2x-stdint-1.c | 13 +++++++++++++ 18 files changed, 151 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/c11-float-8.c create mode 100644 gcc/testsuite/gcc.dg/c11-limits-1.c create mode 100644 gcc/testsuite/gcc.dg/c11-stdarg-4.c create mode 100644 gcc/testsuite/gcc.dg/c11-stdatomic-3.c create mode 100644 gcc/testsuite/gcc.dg/c11-stddef-1.c create mode 100644 gcc/testsuite/gcc.dg/c11-stdint-1.c create mode 100644 gcc/testsuite/gcc.dg/c2x-float-13.c create mode 100644 gcc/testsuite/gcc.dg/c2x-limits-1.c create mode 100644 gcc/testsuite/gcc.dg/c2x-stdarg-5.c create mode 100644 gcc/testsuite/gcc.dg/c2x-stdatomic-1.c create mode 100644 gcc/testsuite/gcc.dg/c2x-stddef-1.c create mode 100644 gcc/testsuite/gcc.dg/c2x-stdint-1.c diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h index bc5439d..172b9de 100644 --- a/gcc/ginclude/float.h +++ b/gcc/ginclude/float.h @@ -624,4 +624,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #endif /* __DEC32_MANT_DIG__ */ +#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L +#define __STDC_VERSION_FLOAT_H__ 202311L +#endif + #endif /* _FLOAT_H___ */ diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index c704c9f..5149f7b 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -125,6 +125,10 @@ typedef __gnuc_va_list va_list; #endif /* not __svr4__ */ +#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L +#define __STDC_VERSION_STDARG_H__ 202311L +#endif + #endif /* _STDARG_H */ #endif /* not _ANSI_STDARG_H_ */ diff --git a/gcc/ginclude/stdatomic.h b/gcc/ginclude/stdatomic.h index a56ba5d..e16b072 100644 --- a/gcc/ginclude/stdatomic.h +++ b/gcc/ginclude/stdatomic.h @@ -248,4 +248,8 @@ extern void atomic_flag_clear (volatile atomic_flag *); extern void atomic_flag_clear_explicit (volatile atomic_flag *, memory_order); #define atomic_flag_clear_explicit(PTR, MO) __atomic_clear ((PTR), (MO)) +#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L +#define __STDC_VERSION_STDATOMIC_H__ 202311L +#endif + #endif /* _STDATOMIC_H */ diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index 2767edf..7980045 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -454,6 +454,7 @@ typedef struct { #if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L #define unreachable() (__builtin_unreachable ()) +#define __STDC_VERSION_STDDEF_H__ 202311L #endif #endif /* _STDDEF_H was defined this time */ diff --git a/gcc/ginclude/stdint-gcc.h b/gcc/ginclude/stdint-gcc.h index 6be01ae..eab651d 100644 --- a/gcc/ginclude/stdint-gcc.h +++ b/gcc/ginclude/stdint-gcc.h @@ -362,4 +362,8 @@ typedef __UINTMAX_TYPE__ uintmax_t; #endif +#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L +#define __STDC_VERSION_STDINT_H__ 202311L +#endif + #endif /* _GCC_STDINT_H */ diff --git a/gcc/glimits.h b/gcc/glimits.h index 8d74c8b..994f7e3 100644 --- a/gcc/glimits.h +++ b/gcc/glimits.h @@ -156,6 +156,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see # define BOOL_MAX 1 # undef BOOL_WIDTH # define BOOL_WIDTH 1 + +# define __STDC_VERSION_LIMITS_H__ 202311L #endif #endif /* _LIMITS_H___ */ diff --git a/gcc/testsuite/gcc.dg/c11-float-8.c b/gcc/testsuite/gcc.dg/c11-float-8.c new file mode 100644 index 0000000..7fb1e0a --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-float-8.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_FLOAT_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors" } */ + +#include + +#ifdef __STDC_VERSION_FLOAT_H__ +#error "__STDC_VERSION_FLOAT_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c11-limits-1.c b/gcc/testsuite/gcc.dg/c11-limits-1.c new file mode 100644 index 0000000..6dc5737 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-limits-1.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_LIMITS_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors" } */ + +#include + +#ifdef __STDC_VERSION_LIMITS_H__ +#error "__STDC_VERSION_LIMITS_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c11-stdarg-4.c b/gcc/testsuite/gcc.dg/c11-stdarg-4.c new file mode 100644 index 0000000..06bff1f --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-stdarg-4.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_STDARG_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors" } */ + +#include + +#ifdef __STDC_VERSION_STDARG_H__ +#error "__STDC_VERSION_STDARG_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c11-stdatomic-3.c b/gcc/testsuite/gcc.dg/c11-stdatomic-3.c new file mode 100644 index 0000000..1f5a71b --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-stdatomic-3.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_STDATOMIC_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors" } */ + +#include + +#ifdef __STDC_VERSION_STDATOMIC_H__ +#error "__STDC_VERSION_STDATOMIC_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c11-stddef-1.c b/gcc/testsuite/gcc.dg/c11-stddef-1.c new file mode 100644 index 0000000..9918d94 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-stddef-1.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_STDDEF_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors" } */ + +#include + +#ifdef __STDC_VERSION_STDDEF_H__ +#error "__STDC_VERSION_STDDEF_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c11-stdint-1.c b/gcc/testsuite/gcc.dg/c11-stdint-1.c new file mode 100644 index 0000000..43fe681 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c11-stdint-1.c @@ -0,0 +1,9 @@ +/* Test __STDC_VERSION_STDINT_H__ not in C11. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c11 -pedantic-errors -ffreestanding" } */ + +#include + +#ifdef __STDC_VERSION_STDINT_H__ +#error "__STDC_VERSION_STDINT_H__ defined" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-float-13.c b/gcc/testsuite/gcc.dg/c2x-float-13.c new file mode 100644 index 0000000..dc54bc7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-float-13.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_FLOAT_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors" } */ + +#include + +#ifndef __STDC_VERSION_FLOAT_H__ +#error "__STDC_VERSION_FLOAT_H__ not defined" +#endif + +#if __STDC_VERSION_FLOAT_H__ != 202311L +#error "bad value of __STDC_VERSION_FLOAT_H__" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-limits-1.c b/gcc/testsuite/gcc.dg/c2x-limits-1.c new file mode 100644 index 0000000..4977faf --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-limits-1.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_LIMITS_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors" } */ + +#include + +#ifndef __STDC_VERSION_LIMITS_H__ +#error "__STDC_VERSION_LIMITS_H__ not defined" +#endif + +#if __STDC_VERSION_LIMITS_H__ != 202311L +#error "bad value of __STDC_VERSION_LIMITS_H__" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c b/gcc/testsuite/gcc.dg/c2x-stdarg-5.c new file mode 100644 index 0000000..1342443 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-stdarg-5.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_STDARG_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors" } */ + +#include + +#ifndef __STDC_VERSION_STDARG_H__ +#error "__STDC_VERSION_STDARG_H__ not defined" +#endif + +#if __STDC_VERSION_STDARG_H__ != 202311L +#error "bad value of __STDC_VERSION_STDARG_H__" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c b/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c new file mode 100644 index 0000000..3a9ceb0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_STDATOMIC_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors" } */ + +#include + +#ifndef __STDC_VERSION_STDATOMIC_H__ +#error "__STDC_VERSION_STDATOMIC_H__ not defined" +#endif + +#if __STDC_VERSION_STDATOMIC_H__ != 202311L +#error "bad value of __STDC_VERSION_STDATOMIC_H__" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-stddef-1.c b/gcc/testsuite/gcc.dg/c2x-stddef-1.c new file mode 100644 index 0000000..1ebdf20 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-stddef-1.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_STDDEF_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors" } */ + +#include + +#ifndef __STDC_VERSION_STDDEF_H__ +#error "__STDC_VERSION_STDDEF_H__ not defined" +#endif + +#if __STDC_VERSION_STDDEF_H__ != 202311L +#error "bad value of __STDC_VERSION_STDDEF_H__" +#endif diff --git a/gcc/testsuite/gcc.dg/c2x-stdint-1.c b/gcc/testsuite/gcc.dg/c2x-stdint-1.c new file mode 100644 index 0000000..3ba6ce5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/c2x-stdint-1.c @@ -0,0 +1,13 @@ +/* Test __STDC_VERSION_STDINT_H__ in C2x. */ +/* { dg-do preprocess } */ +/* { dg-options "-std=c2x -pedantic-errors -ffreestanding" } */ + +#include + +#ifndef __STDC_VERSION_STDINT_H__ +#error "__STDC_VERSION_STDINT_H__ not defined" +#endif + +#if __STDC_VERSION_STDINT_H__ != 202311L +#error "bad value of __STDC_VERSION_STDINT_H__" +#endif -- 2.7.4