diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-09-28 09:47:19 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-09-28 09:47:19 +0200 |
| commit | b1caa1db9d3c49dddfb1dfa6efa090ec69dd1201 (patch) | |
| tree | 92d7404fc83fcc5cffe44f3cd4bb7522d85136b1 /gcc | |
| parent | 87caae2e83f7a8c2c9bf0ba996bc75220e54fadf (diff) | |
| parent | 8dbde52fbcd0ad5749398216064637414d639d89 (diff) | |
| download | gcc-b1caa1db9d3c49dddfb1dfa6efa090ec69dd1201.zip gcc-b1caa1db9d3c49dddfb1dfa6efa090ec69dd1201.tar.gz gcc-b1caa1db9d3c49dddfb1dfa6efa090ec69dd1201.tar.bz2 | |
Merge branch 'releases/gcc-12' into devel/omp/gcc-12
Merge up to r12-8790-g8dbde52fbcd0ad5749398216064637414d639d89 (28th Sep 2022)
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/DATESTAMP | 2 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-format.cc | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP index 44f7751..8830fa8 100644 --- a/gcc/DATESTAMP +++ b/gcc/DATESTAMP @@ -1 +1 @@ -20220923 +20220928 diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 6fe340f..75ecf66 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2022-09-27 Marek Polacek <polacek@redhat.com> + + * c-format.cc (c_keywords): Drop nothrow. + 2022-08-19 Release Manager * GCC 12.2.0 released. diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc index ebdac57..d05e5ac 100644 --- a/gcc/c-family/c-format.cc +++ b/gcc/c-family/c-format.cc @@ -2933,7 +2933,6 @@ static const token_t c_keywords[] = NAME ("noinline", NULL), NAME ("nonnull", NULL), NAME ("noreturn", NULL), - NAME ("nothrow", NULL), NAME ("offsetof", NULL), NAME ("readonly", "read-only"), NAME ("readwrite", "read-write"), |