diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-02 02:09:31 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-02 02:09:31 +0200 |
commit | 42eb62d417e5cf22d6e305cb895fb54299862a53 (patch) | |
tree | aa15e685cb93e5332e5e1fe1460d4a724cf91865 /arch | |
parent | Merge tag 'io_uring-5.7-2020-05-01' of git://git.kernel.dk/linux-block (diff) | |
parent | arm64: vdso: Add -fasynchronous-unwind-tables to cflags (diff) | |
download | linux-42eb62d417e5cf22d6e305cb895fb54299862a53.tar.xz linux-42eb62d417e5cf22d6e305cb895fb54299862a53.zip |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Add -fasynchronous-unwind-tables to the vDSO CFLAGS"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: vdso: Add -fasynchronous-unwind-tables to cflags
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index dd2514bb1511..3862cad2410c 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -32,7 +32,7 @@ UBSAN_SANITIZE := n OBJECT_FILES_NON_STANDARD := y KCOV_INSTRUMENT := n -CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny +CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) |