Skip to content

Commit 10f7052

Browse files
Jens RemusAlexander Gordeev
authored andcommitted
s390/vdso: Generate unwind information for C modules
GDB fails to unwind vDSO functions with error message "PC not saved", for instance when stepping through gettimeofday(). Add -fasynchronous-unwind-tables to CFLAGS to generate .eh_frame DWARF unwind information for the vDSO C modules. Fixes: 4bff8cb ("s390: convert to GENERIC_VDSO") Signed-off-by: Jens Remus <jremus@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 712c5d5 commit 10f7052

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

arch/s390/kernel/vdso32/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ KBUILD_AFLAGS_32 += -m31 -s
2020

2121
KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
2222
KBUILD_CFLAGS_32 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_32))
23-
KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin
23+
KBUILD_CFLAGS_32 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_32))
24+
KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin -fasynchronous-unwind-tables
2425

2526
LDFLAGS_vdso32.so.dbg += -shared -soname=linux-vdso32.so.1 \
2627
--hash-style=both --build-id=sha1 -melf_s390 -T

arch/s390/kernel/vdso64/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ KBUILD_AFLAGS_64 += -m64
2626
KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))
2727
KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64))
2828
KBUILD_CFLAGS_64 := $(filter-out -munaligned-symbols,$(KBUILD_CFLAGS_64))
29-
KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin
29+
KBUILD_CFLAGS_64 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_64))
30+
KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin -fasynchronous-unwind-tables
3031
ldflags-y := -shared -soname=linux-vdso64.so.1 \
3132
--hash-style=both --build-id=sha1 -T
3233

0 commit comments

Comments
 (0)