svn commit: r322915 - head/contrib/compiler-rt/lib/builtins

[John Baldwin]

Author: jhb
Date: Sat Aug 26 00:17:57 2017
New Revision: 322915
URL: https://svnweb.freebsd.org/changeset/base/322915

Log:
  Extend the workaround for LLVM bug 11663 to MIPS N32.
  
  This fixes infinite recursion in /sbin/init for MIPS N32.
  
  Submitted by:	Robert M. Kovacsics <rmk35 at cam.ac.uk>
  MFC after:	1 week
  Sponsored by:	DARPA / AFRL

Modified:
  head/contrib/compiler-rt/lib/builtins/int_lib.h

Modified: head/contrib/compiler-rt/lib/builtins/int_lib.h
==============================================================================
--- head/contrib/compiler-rt/lib/builtins/int_lib.h	Fri Aug 25 23:31:15 2017	(r322914)
+++ head/contrib/compiler-rt/lib/builtins/int_lib.h	Sat Aug 26 00:17:57 2017	(r322915)
@@ -92,12 +92,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);