diff mbox series

arm: Fix CMSE support detection in libgcc (PR target/99157)

Message ID CAKdteOZA49G35hwX5woqCsnhKQdKXcCzkwO6cXDMG8em7vpdtg@mail.gmail.com
State New
Headers show
Series arm: Fix CMSE support detection in libgcc (PR target/99157) | expand

Commit Message

Christophe Lyon Feb. 23, 2021, 5:29 p.m. UTC
As discussed in the PR, the Makefile fragment lacks a double '$' to
get the return-code from GCC invocation, resulting is CMSE support
missing from multilibs.

I checked that the simple patch proposed in the PR fixes the problem.

2021-02-23  Christophe Lyon  <christophe.lyon@linaro.org>
Hau Hsu  <hsuhau617@gmail.com>

PR target/99157
libgcc/
* config/arm/t-arm: Fix cmse support detection.

2>/dev/null; echo $$?),0)
 CMSE_OPTS:=-mcmse
 endif
arm: Fix CMSE support detection in libgcc (PR target/99157)

As discussed in the PR, the Makefile fragment lacks a double '$' to
get the return-code from GCC invocation, resulting is CMSE support
missing from multilibs.

The simple patch proposed in the PR fixes the problem.

2021-02-23  Christophe Lyon  <christophe.lyon@linaro.org>
	Hau Hsu  <hsuhau617@gmail.com>

	PR target/99157
	libgcc/
	* config/arm/t-arm: Fix cmse support detection.

diff --git a/libgcc/config/arm/t-arm b/libgcc/config/arm/t-arm
index 364f40e..3625a25 100644
--- a/libgcc/config/arm/t-arm
+++ b/libgcc/config/arm/t-arm
@@ -4,7 +4,7 @@ LIB1ASMFUNCS = _thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi \
 
 HAVE_CMSE:=$(findstring __ARM_FEATURE_CMSE,$(shell $(gcc_compile_bare) -dM -E - </dev/null))
 HAVE_V81M:=$(findstring armv8.1-m.main,$(gcc_compile_bare))
-ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null 2>/dev/null; echo $?),0)
+ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null 2>/dev/null; echo $$?),0)
 CMSE_OPTS:=-mcmse
 endif

Comments

Christophe Lyon Feb. 24, 2021, 3:14 p.m. UTC | #1
On Tue, 23 Feb 2021 at 18:29, Christophe Lyon
<christophe.lyon@linaro.org> wrote:
>
> As discussed in the PR, the Makefile fragment lacks a double '$' to
> get the return-code from GCC invocation, resulting is CMSE support
> missing from multilibs.
>
> I checked that the simple patch proposed in the PR fixes the problem.

BTW, if OK for trunk, I will also push it to gcc-10.

Christophe

>
> 2021-02-23  Christophe Lyon  <christophe.lyon@linaro.org>
> Hau Hsu  <hsuhau617@gmail.com>
>
> PR target/99157
> libgcc/
> * config/arm/t-arm: Fix cmse support detection.
>
> diff --git a/libgcc/config/arm/t-arm b/libgcc/config/arm/t-arm
> index 364f40e..3625a25 100644
> --- a/libgcc/config/arm/t-arm
> +++ b/libgcc/config/arm/t-arm
> @@ -4,7 +4,7 @@ LIB1ASMFUNCS = _thumb1_case_sqi _thumb1_case_uqi
> _thumb1_case_shi \
>
>  HAVE_CMSE:=$(findstring __ARM_FEATURE_CMSE,$(shell
> $(gcc_compile_bare) -dM -E - </dev/null))
>  HAVE_V81M:=$(findstring armv8.1-m.main,$(gcc_compile_bare))
> -ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null
> 2>/dev/null; echo $?),0)
> +ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null
> 2>/dev/null; echo $$?),0)
>  CMSE_OPTS:=-mcmse
>  endif
Kyrylo Tkachov Feb. 24, 2021, 3:41 p.m. UTC | #2
> -----Original Message-----
> From: Gcc-patches <gcc-patches-bounces@gcc.gnu.org> On Behalf Of
> Christophe Lyon via Gcc-patches
> Sent: 24 February 2021 15:14
> To: gcc Patches <gcc-patches@gcc.gnu.org>
> Subject: Re: arm: Fix CMSE support detection in libgcc (PR target/99157)
> 
> On Tue, 23 Feb 2021 at 18:29, Christophe Lyon
> <christophe.lyon@linaro.org> wrote:
> >
> > As discussed in the PR, the Makefile fragment lacks a double '$' to
> > get the return-code from GCC invocation, resulting is CMSE support
> > missing from multilibs.
> >
> > I checked that the simple patch proposed in the PR fixes the problem.
> 
> BTW, if OK for trunk, I will also push it to gcc-10.
> 

Ok.
Thanks,
Kyrill

> Christophe
> 
> >
> > 2021-02-23  Christophe Lyon  <christophe.lyon@linaro.org>
> > Hau Hsu  <hsuhau617@gmail.com>
> >
> > PR target/99157
> > libgcc/
> > * config/arm/t-arm: Fix cmse support detection.
> >
> > diff --git a/libgcc/config/arm/t-arm b/libgcc/config/arm/t-arm
> > index 364f40e..3625a25 100644
> > --- a/libgcc/config/arm/t-arm
> > +++ b/libgcc/config/arm/t-arm
> > @@ -4,7 +4,7 @@ LIB1ASMFUNCS = _thumb1_case_sqi
> _thumb1_case_uqi
> > _thumb1_case_shi \
> >
> >  HAVE_CMSE:=$(findstring __ARM_FEATURE_CMSE,$(shell
> > $(gcc_compile_bare) -dM -E - </dev/null))
> >  HAVE_V81M:=$(findstring armv8.1-m.main,$(gcc_compile_bare))
> > -ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null
> > 2>/dev/null; echo $?),0)
> > +ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null
> > 2>/dev/null; echo $$?),0)
> >  CMSE_OPTS:=-mcmse
> >  endif
diff mbox series

Patch

diff --git a/libgcc/config/arm/t-arm b/libgcc/config/arm/t-arm
index 364f40e..3625a25 100644
--- a/libgcc/config/arm/t-arm
+++ b/libgcc/config/arm/t-arm
@@ -4,7 +4,7 @@  LIB1ASMFUNCS = _thumb1_case_sqi _thumb1_case_uqi
_thumb1_case_shi \

 HAVE_CMSE:=$(findstring __ARM_FEATURE_CMSE,$(shell
$(gcc_compile_bare) -dM -E - </dev/null))
 HAVE_V81M:=$(findstring armv8.1-m.main,$(gcc_compile_bare))
-ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null
2>/dev/null; echo $?),0)
+ifeq ($(shell $(gcc_compile_bare) -E -mcmse - </dev/null >/dev/null