diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
| commit | 5fe7bd5a37ff0d77936f8e38313db5da2dd53f70 (patch) | |
| tree | 5012e70d0993aa23466e06012d2bfb98ba04aa29 /scripts | |
| parent | 48a78c66ad5d9d4f918182335d6e5726e7008085 (diff) | |
| parent | 67a12ae52599c9f2f24ef14adb43fc3b164792b5 (diff) | |
| download | cachepc-linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.tar.gz cachepc-linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.zip | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.kasan | 3 | ||||
| -rw-r--r-- | scripts/sorttable.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 801c415bac59..b9e94c5e7097 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -33,10 +33,11 @@ else CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \ $(call cc-param,asan-globals=1) \ $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ - $(call cc-param,asan-stack=$(stack_enable)) \ $(call cc-param,asan-instrument-allocas=1) endif +CFLAGS_KASAN += $(call cc-param,asan-stack=$(stack_enable)) + endif # CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_SW_TAGS diff --git a/scripts/sorttable.c b/scripts/sorttable.c index f355869c65cd..6ee4fa882919 100644 --- a/scripts/sorttable.c +++ b/scripts/sorttable.c @@ -54,6 +54,10 @@ #define EM_ARCV2 195 #endif +#ifndef EM_RISCV +#define EM_RISCV 243 +#endif + static uint32_t (*r)(const uint32_t *); static uint16_t (*r2)(const uint16_t *); static uint64_t (*r8)(const uint64_t *); |