[3/4] x86-64/cet: Move check-cet.awk to x86_64

Message ID 20240109193041.3987157-4-hjl.tools@gmail.com
State Superseded
Headers
Series i386: Remove remaining CET bits |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed

Commit Message

H.J. Lu Jan. 9, 2024, 7:30 p.m. UTC
  ---
 sysdeps/x86_64/Makefile               | 2 +-
 sysdeps/{x86 => x86_64}/check-cet.awk | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename sysdeps/{x86 => x86_64}/check-cet.awk (100%)
  

Comments

Adhemerval Zanella Netto Jan. 9, 2024, 7:53 p.m. UTC | #1
On 09/01/24 16:30, H.J. Lu wrote:
> ---
>  sysdeps/x86_64/Makefile               | 2 +-
>  sysdeps/{x86 => x86_64}/check-cet.awk | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename sysdeps/{x86 => x86_64}/check-cet.awk (100%)
> 
> diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
> index 98f0e04f90..abb8b354af 100644
> --- a/sysdeps/x86_64/Makefile
> +++ b/sysdeps/x86_64/Makefile
> @@ -468,7 +468,7 @@ $(cet-built-dso:=.note): %.note: %
>  	mv -f $@T $@
>  common-generated += $(cet-built-dso:$(common-objpfx)%=%.note)
>  
> -$(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \
> +$(objpfx)check-cet.out: $(..)/sysdeps/x86_64/check-cet.awk \
>  			$(cet-built-dso:=.note)
>  	LC_ALL=C $(AWK) -f $^ > $@; \
>  	$(evaluate-test)
> diff --git a/sysdeps/x86/check-cet.awk b/sysdeps/x86_64/check-cet.awk
> similarity index 100%
> rename from sysdeps/x86/check-cet.awk
> rename to sysdeps/x86_64/check-cet.awk

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
  
Andreas Schwab Jan. 9, 2024, 8:16 p.m. UTC | #2
On Jan 09 2024, H.J. Lu wrote:

> -$(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \
> +$(objpfx)check-cet.out: $(..)/sysdeps/x86_64/check-cet.awk \
                                ^
Remove that.
  
H.J. Lu Jan. 9, 2024, 8:20 p.m. UTC | #3
On Tue, Jan 9, 2024 at 12:16 PM Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Jan 09 2024, H.J. Lu wrote:
>
> > -$(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \
> > +$(objpfx)check-cet.out: $(..)/sysdeps/x86_64/check-cet.awk \
>                                 ^
> Remove that.
>

Will fix it.

Thanks.
  

Patch

diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index 98f0e04f90..abb8b354af 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -468,7 +468,7 @@  $(cet-built-dso:=.note): %.note: %
 	mv -f $@T $@
 common-generated += $(cet-built-dso:$(common-objpfx)%=%.note)
 
-$(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \
+$(objpfx)check-cet.out: $(..)/sysdeps/x86_64/check-cet.awk \
 			$(cet-built-dso:=.note)
 	LC_ALL=C $(AWK) -f $^ > $@; \
 	$(evaluate-test)
diff --git a/sysdeps/x86/check-cet.awk b/sysdeps/x86_64/check-cet.awk
similarity index 100%
rename from sysdeps/x86/check-cet.awk
rename to sysdeps/x86_64/check-cet.awk