svn commit: r323827 - stable/11/contrib/compiler-rt/lib/builtins

[John Baldwin]

Author: jhb
Date: Wed Sep 20 20:59:28 2017
New Revision: 323827
URL: https://svnweb.freebsd.org/changeset/base/323827

Log:
  MFC 322915: Extend the workaround for LLVM bug 11663 to MIPS N32.
  
  This fixes infinite recursion in /sbin/init for MIPS N32.
  
  Sponsored by:	DARPA / AFRL

Modified:
  stable/11/contrib/compiler-rt/lib/builtins/int_lib.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/compiler-rt/lib/builtins/int_lib.h
==============================================================================
--- stable/11/contrib/compiler-rt/lib/builtins/int_lib.h	Wed Sep 20 20:48:21 2017	(r323826)
+++ stable/11/contrib/compiler-rt/lib/builtins/int_lib.h	Wed Sep 20 20:59:28 2017	(r323827)
@@ -95,12 +95,13 @@
  * does not have dedicated bit counting instructions.
  */
 #if defined(__FreeBSD__) && (defined(__sparc64__) || \
-    defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__))
+    defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64) || \
+    defined(__riscv__))
 si_int __clzsi2(si_int);
 si_int __ctzsi2(si_int);
 #define	__builtin_clz __clzsi2
 #define	__builtin_ctz __ctzsi2
-#endif /* FreeBSD && (sparc64 || mips_n64 || mips_o64) */
+#endif /* FreeBSD && (sparc64 || mips_n32 || mips_n64 || mips_o64 || riscv) */
 
 COMPILER_RT_ABI si_int __paritysi2(si_int a);
 COMPILER_RT_ABI si_int __paritydi2(di_int a);