diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-27 18:38:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-27 18:38:10 +0100 |
| commit | 59c4e190b10cd2d6edccb5c238a3d2bda071a018 (patch) | |
| tree | 394e0d2a793ada03c280e066cd34f9ce7bf6633a /scripts | |
| parent | spi: spidev: Add SPI ID table (diff) | |
| parent | Linux 5.15-rc3 (diff) | |
| download | linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.tar.gz linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.zip | |
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
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 *); |