On Fri, Mar 3, 2023 at 9:58 AM Xi Ruoyao via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> On Fri, 2023-03-03 at 16:54 +0800, Xi Ruoyao wrote:
> > The driver emits a warning when -fstack-check and
> > -fstack-clash-protection are used together, but the message refers to
> > "-fstack-clash_protection" (underline instead of dash).
>
> Forgot: Ok for trunk? Though I think it's obvious but let's follow the
> procedure :).
OK.
> > gcc/ChangeLog:
> >
> > * toplev.cc (process_options): Fix the spelling of
> > "-fstack-clash-protection".
> > ---
> > gcc/toplev.cc | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/gcc/toplev.cc b/gcc/toplev.cc
> > index 4c15d4f542e..109c9d58cbd 100644
> > --- a/gcc/toplev.cc
> > +++ b/gcc/toplev.cc
> > @@ -1580,7 +1580,7 @@ process_options (bool no_backend)
> > if (flag_stack_check != NO_STACK_CHECK &&
> > flag_stack_clash_protection)
> > {
> > warning_at (UNKNOWN_LOCATION, 0,
> > - "%<-fstack-check=%> and %<-fstack-clash_protection%>
> > are "
> > + "%<-fstack-check=%> and %<-fstack-clash-protection%>
> > are "
> > "mutually exclusive; disabling %<-fstack-check=%>");
> > flag_stack_check = NO_STACK_CHECK;
> > }
>
> --
> Xi Ruoyao <xry...@xry111.site>
> School of Aerospace Science and Technology, Xidian University
