svn commit: r346183 - in stable/12: . share/mk

[Dimitry Andric]

Author: dim
Date: Sat Apr 13 11:09:42 2019
New Revision: 346183
URL: https://svnweb.freebsd.org/changeset/base/346183

Log:
  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 <c.source.code at gmail.com>
  Reviewed by:	emaste
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/UPDATING
  stable/12/share/mk/src.opts.mk

Modified: stable/12/UPDATING
==============================================================================
--- stable/12/UPDATING	Sat Apr 13 10:47:47 2019	(r346182)
+++ stable/12/UPDATING	Sat Apr 13 11:09:42 2019	(r346183)
@@ -16,6 +16,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 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

Modified: stable/12/share/mk/src.opts.mk
==============================================================================
--- stable/12/share/mk/src.opts.mk	Sat Apr 13 10:47:47 2019	(r346182)
+++ stable/12/share/mk/src.opts.mk	Sat Apr 13 11:09:42 2019	(r346183)
@@ -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