diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-01-05 09:32:37 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-01-09 13:55:51 -0300 |
| commit | b7fc4a07f206a640e6d807d72f5c1ee3ea7a25b6 (patch) | |
| tree | 51669d2e37be82d006f4f665f47274ed78273cbb /sysdeps/unix | |
| parent | 46e713be5770b19568fab074afbc7d992b0c3624 (diff) | |
| download | glibc-b7fc4a07f206a640e6d807d72f5c1ee3ea7a25b6.zip glibc-b7fc4a07f206a640e6d807d72f5c1ee3ea7a25b6.tar.gz glibc-b7fc4a07f206a640e6d807d72f5c1ee3ea7a25b6.tar.bz2 | |
x86: Move CET infrastructure to x86_64
The CET is only supported for x86_64 and there is no plan to add
kernel support for i386. Move the Makefile rules and files from the
generic x86 folder to x86_64 one.
Checked on x86_64-linux-gnu and i686-linux-gnu.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/Makefile | 27 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/Makefile | 27 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h (renamed from sysdeps/unix/sysv/linux/x86/include/asm/prctl.h) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/tst-cet-property-1.c (renamed from sysdeps/unix/sysv/linux/x86/tst-cet-property-1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/tst-cet-property-2.c (renamed from sysdeps/unix/sysv/linux/x86/tst-cet-property-2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/tst-cet-property-dep-2.S (renamed from sysdeps/unix/sysv/linux/x86/tst-cet-property-dep-2.S) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/tst-cet-setcontext-1.c (renamed from sysdeps/unix/sysv/linux/x86/tst-cet-setcontext-1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/tst-cet-vfork-1.c (renamed from sysdeps/unix/sysv/linux/x86/tst-cet-vfork-1.c) | 0 |
8 files changed, 27 insertions, 27 deletions
diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile index 9dfdd68..743b633 100644 --- a/sysdeps/unix/sysv/linux/x86/Makefile +++ b/sysdeps/unix/sysv/linux/x86/Makefile @@ -21,30 +21,3 @@ endif ifeq ($(subdir),setjmp) tests += tst-saved_mask-1 endif - -ifneq ($(enable-cet),no) -ifeq ($(subdir),elf) -tests += tst-cet-property-1 tst-cet-property-2 - -CFLAGS-tst-cet-property-1.o += -fcf-protection -ASFLAGS-tst-cet-property-dep-2.o += -fcf-protection - -$(objpfx)tst-cet-property-2: $(objpfx)tst-cet-property-dep-2.o -$(objpfx)tst-cet-property-2.out: $(objpfx)tst-cet-property-2 \ - $(objpfx)tst-cet-property-1.out - env $(run-program-env) $(test-via-rtld-prefix) \ - $(objpfx)tst-cet-property-2 \ - < $(objpfx)tst-cet-property-1.out > $@; \ - $(evaluate-test) -endif - -ifeq ($(subdir),posix) -tests += tst-cet-vfork-1 -CFLAGS-tst-cet-vfork-1.c += -mshstk -endif - -ifeq ($(subdir),stdlib) -tests += tst-cet-setcontext-1 -CFLAGS-tst-cet-setcontext-1.c += -mshstk -endif -endif diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile index 06b8739..4223feb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -64,3 +64,30 @@ $(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so cp $< $@ endif endif # $(subdir) == elf + +ifneq ($(enable-cet),no) +ifeq ($(subdir),elf) +tests += tst-cet-property-1 tst-cet-property-2 + +CFLAGS-tst-cet-property-1.o += -fcf-protection +ASFLAGS-tst-cet-property-dep-2.o += -fcf-protection + +$(objpfx)tst-cet-property-2: $(objpfx)tst-cet-property-dep-2.o +$(objpfx)tst-cet-property-2.out: $(objpfx)tst-cet-property-2 \ + $(objpfx)tst-cet-property-1.out + env $(run-program-env) $(test-via-rtld-prefix) \ + $(objpfx)tst-cet-property-2 \ + < $(objpfx)tst-cet-property-1.out > $@; \ + $(evaluate-test) +endif + +ifeq ($(subdir),posix) +tests += tst-cet-vfork-1 +CFLAGS-tst-cet-vfork-1.c += -mshstk +endif + +ifeq ($(subdir),stdlib) +tests += tst-cet-setcontext-1 +CFLAGS-tst-cet-setcontext-1.c += -mshstk +endif +endif diff --git a/sysdeps/unix/sysv/linux/x86/include/asm/prctl.h b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h index 2f51132..2f51132 100644 --- a/sysdeps/unix/sysv/linux/x86/include/asm/prctl.h +++ b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h diff --git a/sysdeps/unix/sysv/linux/x86/tst-cet-property-1.c b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-1.c index e13c752..e13c752 100644 --- a/sysdeps/unix/sysv/linux/x86/tst-cet-property-1.c +++ b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-1.c diff --git a/sysdeps/unix/sysv/linux/x86/tst-cet-property-2.c b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-2.c index 5274a09..5274a09 100644 --- a/sysdeps/unix/sysv/linux/x86/tst-cet-property-2.c +++ b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-2.c diff --git a/sysdeps/unix/sysv/linux/x86/tst-cet-property-dep-2.S b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-dep-2.S index 6a8dd8b..6a8dd8b 100644 --- a/sysdeps/unix/sysv/linux/x86/tst-cet-property-dep-2.S +++ b/sysdeps/unix/sysv/linux/x86_64/tst-cet-property-dep-2.S diff --git a/sysdeps/unix/sysv/linux/x86/tst-cet-setcontext-1.c b/sysdeps/unix/sysv/linux/x86_64/tst-cet-setcontext-1.c index 388931f..388931f 100644 --- a/sysdeps/unix/sysv/linux/x86/tst-cet-setcontext-1.c +++ b/sysdeps/unix/sysv/linux/x86_64/tst-cet-setcontext-1.c diff --git a/sysdeps/unix/sysv/linux/x86/tst-cet-vfork-1.c b/sysdeps/unix/sysv/linux/x86_64/tst-cet-vfork-1.c index 56d7753..56d7753 100644 --- a/sysdeps/unix/sysv/linux/x86/tst-cet-vfork-1.c +++ b/sysdeps/unix/sysv/linux/x86_64/tst-cet-vfork-1.c |