Page MenuHomeFreeBSD
Files F173719845

D60048.id187757.diff
No OneTemporary
Actions

D60048.id187757.diff
View Options

diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh
--- a/sys/tools/amd64_ia32_vdso.sh
+++ b/sys/tools/amd64_ia32_vdso.sh
@@ -58,7 +58,9 @@
exit 1
fi
-${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \
+# vdso_wrap.S .incbin's the vdso; ccache cannot see that dependency and
+# would embed a stale image. Build it without ccache.
+env CCACHE_DISABLE=1 ${CC} -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
diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh
--- a/sys/tools/amd64_vdso.sh
+++ b/sys/tools/amd64_vdso.sh
@@ -67,7 +67,9 @@
exit 1
fi
-${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \
+# vdso_wrap.S .incbin's the vdso; ccache cannot see that dependency and
+# would embed a stale image. Build it without ccache.
+env CCACHE_DISABLE=1 ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \
-o elf-vdso.so.o -I. -I"${S}" -include opt_global.h \
-DVDSO_NAME=elf_vdso_so_1 -DVDSO_FILE=\"elf-vdso.so.1\" \
"${S}"/tools/vdso_wrap.S

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 28, 10:43 PM (4 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39756326
Default Alt Text
D60048.id187757.diff (1 KB)

Event Timeline