diff options
| author | Mike Pall <mike> | 2025-10-28 00:27:15 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2025-10-28 00:27:15 +0100 |
| commit | e34a78acf6b8656874b1c25a12a7cd1813d73af9 (patch) | |
| tree | 52755c28fb727cc2296ed4f889b52378e802abf4 /src/Makefile | |
| parent | 25a61a182166fec06f1a1a025eb8fabbb6cf483e (diff) | |
| download | luajit-e34a78acf6b8656874b1c25a12a7cd1813d73af9.tar.gz luajit-e34a78acf6b8656874b1c25a12a7cd1813d73af9.tar.bz2 luajit-e34a78acf6b8656874b1c25a12a7cd1813d73af9.zip | |
x64: Various fixes for CET IBT.
Also add ELF notes. #1391
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index d23e0db2..e657af13 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -446,9 +446,13 @@ ifneq (,$(findstring LJ_ABI_PAUTH 1,$(TARGET_TESTARCH))) | |||
| 446 | DASM_AFLAGS+= -D PAUTH | 446 | DASM_AFLAGS+= -D PAUTH |
| 447 | TARGET_ARCH+= -DLJ_ABI_PAUTH=1 | 447 | TARGET_ARCH+= -DLJ_ABI_PAUTH=1 |
| 448 | endif | 448 | endif |
| 449 | ifneq (,$(findstring LJ_CET_BR 1,$(TARGET_TESTARCH))) | 449 | ifneq (,$(findstring LJ_ABI_BRANCH_TRACK 1,$(TARGET_TESTARCH))) |
| 450 | DASM_AFLAGS+= -D CET_BR | 450 | DASM_AFLAGS+= -D BRANCH_TRACK |
| 451 | TARGET_ARCH+= -DLJ_CET_BR=1 | 451 | TARGET_ARCH+= -DLJ_ABI_BRANCH_TRACK=1 |
| 452 | endif | ||
| 453 | ifneq (,$(findstring LJ_ABI_SHADOW_STACK 1,$(TARGET_TESTARCH))) | ||
| 454 | DASM_AFLAGS+= -D SHADOW_STACK | ||
| 455 | TARGET_ARCH+= -DLJ_ABI_SHADOW_STACK=1 | ||
| 452 | endif | 456 | endif |
| 453 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) | 457 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) |
| 454 | ifeq (Windows,$(TARGET_SYS)) | 458 | ifeq (Windows,$(TARGET_SYS)) |