From owner-svn-src-head@freebsd.org Sat Oct 24 23:21:31 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 465974573D2; Sat, 24 Oct 2020 23:21:31 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CJcYP6lVvz4GF2; Sat, 24 Oct 2020 23:21:27 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BADE32017A; Sat, 24 Oct 2020 23:21:27 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09ONLRYk055870; Sat, 24 Oct 2020 23:21:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09ONLRfJ055868; Sat, 24 Oct 2020 23:21:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202010242321.09ONLRfJ055868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 24 Oct 2020 23:21:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367031 - in head/sys/i386: i386 include X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/i386: i386 include X-SVN-Commit-Revision: 367031 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2020 23:21:31 -0000 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