From nobody Thu Jun 15 16:39:38 2023 X-Original-To: dev-commits-src-main@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 4Qhp0q1fmKz4fRmr; Thu, 15 Jun 2023 16:39:39 +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 4Qhp0q1Cz8z4Fw3; Thu, 15 Jun 2023 16:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847179; 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=ccoGXnPf4GOIG7Zl1moi4031fm2z7ApCYctaOBcq9vw=; b=B8SEJnLFGdQXhPbINsHZII/YSk9ks4kcAJc9qf4PXc0TtlFYGD8/qigxH659AFVpwinTbg lZ2FXNZ08Aq8tbSyhL23+hXKCxJR+I02iWtc3t/oJdcB2lbLQ4nRp7vmwaTMYsLIuxq6i/ BGMafqnyyeYW71K4ktrNymmOA3VMWSgyzz4rAxGVTMxYrypfybRGJek0KCrcNEybp665zB qbrq3BfCltPM82fMqxcWGPFKXQmiU/EmrLZpArQrtfWl4VtD0/pwygbKUImK3Eo4SfRvb1 YvxUgH0uLas2lz5UlHPLeuZwJerJ96hDHKOZ1zIrRjQm/RfP5A6wL5P3FPowLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847179; 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=ccoGXnPf4GOIG7Zl1moi4031fm2z7ApCYctaOBcq9vw=; b=R09q2TUkpoAZ+RCnhuOxPli+nfLTQ//mddDx1tpowc2kaRh7m601pfR47nMiIVeYhuchDM u1bOh0eW+adF93fenYFKDw5DX4DaduWuoQykijAg9lYNzjkX9BihAUvSHvYv87HmeKTwh2 nvGJWH6YdwLo0X9jffBTHmdu6SWjv71+n3QvIZgjh2St4/Slkiq/VYdExy6HXceRqLN48E Eyr/B8rt/prBpvLe/k9VJfezIBolQ0/QPf6Hb1KgoSIumUGxFDhTScm0l3/Lcs5AYHhP5o 8jtX7EeJgrYgMdD4o3QbM5B6MvKy6m4zllMNrT8IC7Uf85aokTgunJNJ3iibTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686847179; a=rsa-sha256; cv=none; b=VaM3m0MNn16WAay9p+JahDCy8ur3o2M2obp8zl3RAoGXnZTc7rdEXpfYPkbAm93vWkKA5L Lhj+nEsLWpBU05jPE/k8tXerfiJfK2sMcSlj3geIUNQcQUVmls44o695E+2z4uwDpQti4v oeQJ6Wo4E2rzzLuGEuLgD7x/DL0sTMbMUFykdiqyPx/767vjDBUr/MMSfJDAk+QvhIv9H1 ZKmd0nTNXb/Lg2mwFnR8ZJkJ1DmLK+ol1z5mw14fK0xL5swg7gDdJtbBtGUHwCi6OXd7I2 LbZ53OXFOSmOXYsoztbI6NfZo6oOReVKvrrGRMm3OkYEuNhjjndAffgJ+SfYRQ== 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 4Qhp0q096jztB5; Thu, 15 Jun 2023 16:39:39 +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 35FGdcnY085865; Thu, 15 Jun 2023 16:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FGdcQh085864; Thu, 15 Jun 2023 16:39:38 GMT (envelope-from git) Date: Thu, 15 Jun 2023 16:39:38 GMT Message-Id: <202306151639.35FGdcQh085864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1ee66195db08 - main - armv8crypto: Avoid overriding -march when compiling some source files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ee66195db08c7f1f902e139ecdb63587ee36364 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee66195db08c7f1f902e139ecdb63587ee36364 commit 1ee66195db08c7f1f902e139ecdb63587ee36364 Author: Mark Johnston AuthorDate: 2023-06-15 16:10:19 +0000 Commit: Mark Johnston CommitDate: 2023-06-15 16:38:45 +0000 armv8crypto: Avoid overriding -march when compiling some source files At least one downstream (CheriBSD) overrides -march here. Instead of hard-coding the target, simply append the crypto extension to whatever's already there. No functional change intended. Reviewed by: imp, andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40537 --- sys/conf/files.arm64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 1fed31af0761..da71606a4b84 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -119,17 +119,17 @@ dev/iommu/iommu_gas.c optional iommu crypto/armv8/armv8_crypto.c optional armv8crypto armv8_crypto_wrap.o optional armv8crypto \ dependency "$S/crypto/armv8/armv8_crypto_wrap.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} -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} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "armv8_crypto_wrap.o" aesv8-armx.o optional armv8crypto | ossl \ 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/ ${WERROR} ${NO_WCAST_QUAL} -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} ${CFLAGS:M-march=*:S/^$/-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/ ${WERROR} ${NO_WCAST_QUAL} -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} ${CFLAGS:M-march=*:S/^$/-march=armv8-a/}+crypto ${.IMPSRC}" \ no-implicit-rule \ clean "ghashv8-armx.o"