diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2021-12-06 23:09:29 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2022-01-24 23:59:30 +0000 |
| commit | 1c818a7e577ce30bc7ca852513e7877024424f35 (patch) | |
| tree | 8218d32c28e27bcd5ee13cbbedd901bbe054e89c /sys/tools/amd64_ia32_vdso.sh | |
| parent | 9c210b36abe0ecada8d32227a0bb40bba5185a68 (diff) | |
| download | src-1c818a7e577ce30bc7ca852513e7877024424f35.tar.gz src-1c818a7e577ce30bc7ca852513e7877024424f35.zip | |
amd64: Pass DEBUG when building VDSO wrapper
Not doing so results in ctfconvert failing with
ERROR: ctfconvert: elf-vdso.so.o doesn't have type data to convert
On FreeBSD this is non-fatal, since the ctf tools have a hack to make
such errors not fail the build and instead just silently continue
without CTF data (which is a bad idea these days and should probably be
removed; they date back to the original import). However, those are
under #ifdef __FreeBSD__ so do not apply when cross-building from
non-FreeBSD, causing the build to fail.
Fix this by forwarding DEBUG on to the compiler invocation for the VDSO
wrapper. It's assembly so it's not hugely useful, but there is a
non-zero amount of information preserved, and other assembly files are
built with -g by default too so this matches them; the alternative would
be to tag the files.amd64 entries with no-ctfmerge. Note that the VDSO
itself is still compiled without debug info, this only affects the
wrapper linked into the kernel.
Fixes: 98c8b6252496 ("vdso for ia32 on amd64"), ab4524b3d7fb ("amd64: wrap 64bit sigtramp into vdso")
MFC after: 1 month
(cherry picked from commit 169b368a62aac38091a302b2970df81e0281e98f)
Diffstat (limited to 'sys/tools/amd64_ia32_vdso.sh')
| -rw-r--r-- | sys/tools/amd64_ia32_vdso.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index d03249dd4940..6198ca8c6ffa 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -53,7 +53,7 @@ then exit 1 fi -${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ +${CC} ${DEBUG} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso32.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso32_so_1 -DVDSO_FILE=elf-vdso32.so.1 \ "${S}"/tools/vdso_wrap.S |