svn commit: r367031 - in head/sys/i386: i386 include

[Warner Losh]

Author: imp
Date: Sat Oct 24 23:21:27 2020
New Revision: 367031
URL: https://svnweb.freebsd.org/changeset/base/367031

Log:
  Remove support for intel compiler from i386 in_cksum
  
  We no longer support building the kernel with the old intel
  compiler. Remove support for it from in_cksum. Should there be
  interest in reviving it, this is as likely to get in the way as to
  help anyway.

Modified:
  head/sys/i386/i386/in_cksum.c
  head/sys/i386/include/in_cksum.h

Modified: head/sys/i386/i386/in_cksum.c
==============================================================================
--- head/sys/i386/i386/in_cksum.c	Sat Oct 24 23:21:22 2020	(r367030)
+++ head/sys/i386/i386/in_cksum.c	Sat Oct 24 23:21:27 2020	(r367031)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
  * icc needs to be special cased here, as the asm code below results
  * in broken code if compiled with icc.
  */
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
 /* non gcc parts stolen from sys/alpha/alpha/in_cksum.c */
 #define REDUCE32							  \
     {									  \
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #define REDUCE          {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
 
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
 static const u_int32_t in_masks[] = {
 	/*0 bytes*/ /*1 byte*/	/*2 bytes*/ /*3 bytes*/
 	0x00000000, 0x000000FF, 0x0000FFFF, 0x00FFFFFF,	/* offset 0 */

Modified: head/sys/i386/include/in_cksum.h
==============================================================================
--- head/sys/i386/include/in_cksum.h	Sat Oct 24 23:21:22 2020	(r367030)
+++ head/sys/i386/include/in_cksum.h	Sat Oct 24 23:21:27 2020	(r367031)
@@ -55,7 +55,7 @@
  * in the normal case (where there are no options and the header length is
  * therefore always exactly five 32-bit words.
  */
-#if defined(__GNUCLIKE_ASM) && !defined(__INTEL_COMPILER)
+#if defined(__GNUCLIKE_ASM)
 #if defined(IPVERSION) && (IPVERSION == 4)
 static __inline u_int
 in_cksum_hdr(const struct ip *ip)
@@ -137,7 +137,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
 #endif
 
 #ifdef _KERNEL
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
 #if defined(IPVERSION) && (IPVERSION == 4)
 u_int in_cksum_hdr(const struct ip *ip);
 #endif