From ea235a20afe1ac666a42be87edd736183c3405e2 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 13 Apr 2019 11:09:42 +0000 Subject: [PATCH] Revert r344898 (by kib), now that clang 8 has been merged: Disable WITH_RETPOLINE on stable/12. It is known that clang 7 generates broken ifunc calls when retpoline is enabled. Since libc uses ifuncs, mark WITH_RETPOLINE as always broken and disabled. To be removed after clang 8 MFC. This is a direct commit to the branch. Reported by: many Tested by: Nikola Mihaylov Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- UPDATING | 5 +++++ share/mk/src.opts.mk | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index 810ebf3f9a8..ab50b8da73d 100644 --- a/UPDATING +++ b/UPDATING @@ -16,6 +16,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20190413: + Now Clang 8 has been merged (see the 20190412 entry below), the ifunc + functionality needed for the RETPOLINE option should work properly + again. The RETPOLINE option has been removed from BROKEN_OPTIONS. + 20190412: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to 8.0.0. Please see the 20141231 entry below for information about diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 13e0a2d0a76..f05b46b6d89 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -369,9 +369,6 @@ BROKEN_OPTIONS+=LOADER_UBOOT BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# clang 7.0 -BROKEN_OPTIONS+=RETPOLINE - .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 BROKEN_OPTIONS+=PROFILE -- 2.45.0