Skip to content

Commit ce600a1

Browse files
author
ripley
committed
prepare for the release of gcc-15 expected on Friday
git-svn-id: https://svn.r-project.org/R/trunk@88163 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 8ffeffb commit ce600a1

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

config.site

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@
9797
## no-return flag
9898
## Header R-exts/Error.h contains alternaive definitions for the NORET
9999
## macro, depending on the C standard found. If the compiler does not
100-
## comply (and GCC pre=15 did not in 2024-12), use this to pick one of the
101-
## others, or even define to be empty.
100+
## comply, use this to pick one of the others, or even define to be empty.
102101
## NORET=
103102

104103
## The following additional CFLAGS to be used only in the main

doc/NEWS.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
compilation of \R and packages. \R builds can opt out \emph{via} the
350350
\command{configure} flag \option{--without-C23}, unless the
351351
specified or default (usually \command{gcc}) compiler defaults to C23:
352-
\command{gcc}\sspace{}15 will.
352+
\command{gcc}\sspace{}15 does.
353353
354354
%% GCC 13 was released in 2023-04, LLVM 18 was 2024-03, 15 was 2022-09
355355
%% Apple clang 14.0.3 was too old: 15 is the earliest that can be

doc/manual/R-exts.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3162,7 +3162,7 @@ option which selects C23 if one is available. Some compilers (including
31623162
later have such an option.
31633163

31643164
@c GCC 14, LLVM clang 18-20 and Apple clang 16 default to C17
3165-
@c In 2025-01 GCC pre=15 defaulted to C23 (and later documented so)
3165+
@c In 2025-01 GCC pre-15 defaulted to C23 (and later was documented so)
31663166
The @command{configure} script in recent previous versions of @R{} aimed
31673167
to choose a C compiler which supported C11: as the default in recent
31683168
versions of @command{gcc} (prior to 15), @I{LLVM} @command{clang} and
@@ -6526,7 +6526,7 @@ to @code{PKG_CXXFLAGS} will allow this, but that flag is only accepted
65266526
by recent versions of @I{LLVM} @command{clang} (and will not be in future)
65276527
so needs a @command{configure} test.
65286528

6529-
Pre=built versions of current @command{clang}/@code{libc++} are
6529+
Pre-built versions of current @command{clang}/@code{libc++} are
65306530
usually available from
65316531
@uref{https://github.com/llvm/llvm-project/releases} for a wide range of
65326532
platforms (but the Windows builds there are not compatible with

src/include/R_ext/Error.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ extern "C" {
3535
/*
3636
* As this is sometimes an attribute, it should precede 'static' in a
3737
* function declaration.
38-
* gcc pre-15 requires it to precede 'attribute_hidden'.
38+
* gcc 15 requires it to precede 'attribute_hidden'.
3939
* OTOH, '_Noreturn' is an obsolescent (in C23) function specifier.
4040
*/
4141
#if defined NORET
4242
#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L)
43-
// gcc 15 and clang 19-
43+
// gcc 15 LLVM clang 19- and Apple clang 17
4444
# define NORET [[noreturn]]
4545
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L
4646
# define NORET _Noreturn

0 commit comments

Comments
 (0)