From nobody Tue May 10 23:23:58 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A0EED1AD7891; Tue, 10 May 2022 23:23:59 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyYyR2jj9z4c2T; Tue, 10 May 2022 23:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbjkXR2RPQjTAQrjC0md2pIILDwK8TALlfCYqNJjo6M=; b=QFpgpRs0Yjv/ur9QiYcj9I8j5+PUBu2MC0LlKIN9S5MnuC8WzkwRb44Dg/GOEjHiyEtmtq dn11OgeYHVLmT55L5j6OuDclyiolkEkbxj1QxBPiXdBEViLCNl2ByNaHKpivFstQrB0Wz7 9aDWFtEir8NhXQj2CMtrfqvjTbgrH5+76bBimEaVOl2bwyO/HXpqcSo2wbNrCFldX3uAzC vljQzbfhqYOVMuTolWq6FYRXKAAVmsNnV+PA62pGrHjqGxgqk6xkqJeAm9y2wdrttmeoOi e+wj961qoJy5g7cM1YQ0SHLu83kyGd9HNL5ZOttcTRQKEbDy0WNbFqoRerUZmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D75969E0; Tue, 10 May 2022 23:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24ANNwJZ072216; Tue, 10 May 2022 23:23:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ANNw4V072215; Tue, 10 May 2022 23:23:58 GMT (envelope-from git) Date: Tue, 10 May 2022 23:23:58 GMT Message-Id: <202205102323.24ANNw4V072215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3200378545f9 - stable/13 - Remove nonexistent include path for arm64 crypto files. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3200378545f9460a9f2878cd7edd8251c5a95a72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbjkXR2RPQjTAQrjC0md2pIILDwK8TALlfCYqNJjo6M=; b=dCPlxFCO8LgjxDQx7kbAfx4fglDmP2TwLv6FsXy7EeRuVyGzPDYd0a4FIJWce/AKkRQELv RJxoj0Tcr+1Eeha05AyOJ6yHr7oEUiW9aZ2MsjTbD6d86GsInjreZxOk+tpU6Pt8zg4FPd kadVmYhFItv/gKB+yLkf7H79IMzoswAdFSuaflMY7VBMi4kWBxcxekaL2V9T7ZFAikxpNw j00XBMCVDv/rgfvisMZTjZIBuceQDRdoSbTpbhoSJ/hJNo6wfPoLQuTcDXRy48MrsNSDgj X9yVf4AsSOCqHJhKsqMipfPw++zL+J5eNQMPdINZ63u3Z4u2FkYSMgmsub/fVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652225039; a=rsa-sha256; cv=none; b=msnh3bxXMDT7GXlG7cYzMD0IqqomFjVV1uftnjE0svYPZo1bXJCeGg5UEAsyxYEQ9gzTVy aq6Sd7D6JUKYtYHQCMCWmYgCd+oSUlO/7PwPr+/fFpYtmWC2KkpUQX9jdjyRdbSCd2pzmp 9ashdInKgZvV5dsG+hKFvFHbzYlkwqtEKVTskeKp7fptOJFaGC24O7vcwH3r9a9Y4kreiX rNz3BtxDQHNN1jlsEeMyi89MXpy4g7GUHtQLnWK0jX0CClCXVgfx2Q9cAcXzWL7mWpCOW2 k981DnSKJ5Zj6MoOJSb2jZcaDczCFp0QkK/teqlmcEXaJfYt8l5p3o1yTBe9PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3200378545f9460a9f2878cd7edd8251c5a95a72 commit 3200378545f9460a9f2878cd7edd8251c5a95a72 Author: John Baldwin AuthorDate: 2021-09-15 16:03:17 +0000 Commit: John Baldwin CommitDate: 2022-05-10 22:51:49 +0000 Remove nonexistent include path for arm64 crypto files. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D31932 (cherry picked from commit 828f257277bd7418bbc0431bbd78569a2f609af1) --- sys/conf/files.arm64 | 4 ++-- sys/modules/armv8crypto/Makefile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 89dae243011f..88c0628b9416 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -116,12 +116,12 @@ armv8_crypto_wrap.o optional armv8crypto \ clean "armv8_crypto_wrap.o" aesv8-armx.o optional armv8crypto \ dependency "$S/crypto/openssl/aarch64/aesv8-armx.S" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "aesv8-armx.o" ghashv8-armx.o optional armv8crypto \ dependency "$S/crypto/openssl/aarch64/ghashv8-armx.S" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "ghashv8-armx.o" diff --git a/sys/modules/armv8crypto/Makefile b/sys/modules/armv8crypto/Makefile index bd38fe039fc9..b252a72609be 100644 --- a/sys/modules/armv8crypto/Makefile +++ b/sys/modules/armv8crypto/Makefile @@ -20,7 +20,6 @@ armv8_crypto_wrap.o: armv8_crypto_wrap.c aesv8-armx.o: aesv8-armx.S ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \ -I${SRCTOP}/sys/crypto/armv8 \ - -I${SRCTOP}/sys/crypto/openssl/crypto \ ${WERROR} ${PROF} \ -march=armv8-a+crypto ${.IMPSRC} ${CTFCONVERT_CMD} @@ -28,7 +27,6 @@ aesv8-armx.o: aesv8-armx.S ghashv8-armx.o: ghashv8-armx.S ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \ -I${SRCTOP}/sys/crypto/armv8 \ - -I${SRCTOP}/sys/crypto/openssl/crypto \ ${WERROR} ${PROF} \ -march=armv8-a+crypto ${.IMPSRC} ${CTFCONVERT_CMD}