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

[Warner Losh]

Author: imp
Date: Tue Dec  5 22:24:20 2017
New Revision: 326600
URL: https://svnweb.freebsd.org/changeset/base/326600

Log:
  Since this is contrib code, create an upstreamable version of my
  change. Now on FreeBSD and NetBSD if _STANDALONE is defined, we
  include the kernel version with alloances for the quirky differences
  between the two.
  
  Sponsored by: Netflix

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	Tue Dec  5 22:19:59 2017	(r326599)
+++ head/contrib/compiler-rt/lib/builtins/int_lib.h	Tue Dec  5 22:24:20 2017	(r326600)
@@ -55,12 +55,16 @@
 #define UNUSED __attribute__((unused))
 #endif
 
-#if (defined(_KERNEL) || defined(_STANDALONE))
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && (defined(_KERNEL) || defined(_STANDALONE))
 /*
  * Kernel and boot environment can't use normal headers,
  * so use the equivalent system headers.
  */
+#ifdef __FreeBSD__
 #  include <sys/limits.h>
+#else
+#  include <machine/limits.h>
+#endif
 #  include <sys/stdint.h>
 #  include <sys/types.h>
 #else