From nobody Wed Oct 25 20:06:27 2023 X-Original-To: dev-commits-src-branches@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 4SG0LW4pQpz4xymj; Wed, 25 Oct 2023 20:06:27 +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 4SG0LW3rvVz3T0T; Wed, 25 Oct 2023 20:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698264387; 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=7jlW9b9qQidodA9wd5kyUUAMDXFxUYDxRoK4fw9eI7A=; b=xpL6mJrZNP3esa3bqji6IR2EHf+U5eyIEY1J6aaK1nPVB5K9DuAN2z07SQ9rq94YdA1C4X oYcQvFaCs3t9Ks1rDPmB2TyIYET7PqAeGnVpZj0foWvnnIKNxwhCaV++J1+OHHi5DB6ISI Y5rTTXRawlbpSQ+ssGDsY6Put7ikGgFeMSDkJVmf1Hm5O0yilWnP6Y3M/Hr/2SowoQmMt2 JH0IQ6Yw4x2rrtR3I1p2U8MFDWzjoZ28YiUL1ywul73PqSMOXww0FIbcocAfQfwPbxjd+v iyhv88vlig5A9pH4bwRBrjiozZkU/4UnwBUXILeEaVuqCwcPHUDTdwlWWZqtWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698264387; a=rsa-sha256; cv=none; b=dmUTsBBao2XRBMJRjH9fVjUextEQanmYM5oiYDkcFV+Tk5T7kIFTexIpWiey/fvy1njSNF gHaR9Vatt2/zwTYFfL6IQljWqYDVUXynZvAoW9qEYHt9iCweIoyaEqpCo1iBhzaTtoFqX7 aYcxqh00F6sOpmemrLT1pCWw+JRAqyup9rQ3dhVpFrbUqRUwvzTHt6LebPPR0WkmwOanqc nJhNiAi4JtdHzxix2e0vwq+n57fkZXL5ndJUDRKZPJd11tU2qkBkJbSy8nTJYtuIRjKaHr oa16HDNZKP3/rC84UKQGUprydGFg1h4ej07lujOwn9r3NQROjtoTu+hKE9RRgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698264387; 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=7jlW9b9qQidodA9wd5kyUUAMDXFxUYDxRoK4fw9eI7A=; b=UMPRZ6AjqSdtmxQE/sB4p0fOGha99FGbJAG3bVSfkCv8IATvkvkDEsxS7F7RlfR+aNZ6GU Rac4EsCmY/jU9IzrR01chKxy++0/bq/8kOlGQ69mQxwCRUySqOrfWo7Hpva6NNQYiC2hiG m57rAnDumLKWxzkKboNLODYDSQ3XBsDRTRcQJfB+M7CMQCDVY0M8DUFjYATn4QKD37M0qG Wz92fteoweEfz8baVNvAurfyHqRG/bv+tPnVx+rPSo9afj6O9g9NosLPt0AI0kTNWbjFhN V9YDopa2+erRNR+ohcElqlKRuUCDjl4jAvid+EyJm6oVPvXqn6ykqB7Npn6cEQ== 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 4SG0LW2jPQz1GvK; Wed, 25 Oct 2023 20:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39PK6Rcs039924; Wed, 25 Oct 2023 20:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PK6ROA039922; Wed, 25 Oct 2023 20:06:27 GMT (envelope-from git) Date: Wed, 25 Oct 2023 20:06:27 GMT Message-Id: <202310252006.39PK6ROA039922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1945b8632d68 - releng/14.0 - libcrypto: Add buildasm and cleanasm targets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1945b8632d6822f5ca37c76a4ba5854fc7dc8511 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1945b8632d6822f5ca37c76a4ba5854fc7dc8511 commit 1945b8632d6822f5ca37c76a4ba5854fc7dc8511 Author: John Baldwin AuthorDate: 2023-08-29 21:39:54 +0000 Commit: Ed Maste CommitDate: 2023-10-25 19:56:08 +0000 libcrypto: Add buildasm and cleanasm targets These targets generate all the assembly files in sys/crypto/openssl. Reviewed by: markj, emaste (earlier version) Differential Revision: https://reviews.freebsd.org/D41590 (cherry picked from commit 73653b72af65e294dcfedc43a8ea09b2137d72ed) (cherry picked from commit ef81451d114ebae9f77e195534898b6c4061aa69) Approved by: re (gjb) --- secure/lib/libcrypto/Makefile | 7 +++++++ secure/lib/libcrypto/Makefile.common | 2 ++ 2 files changed, 9 insertions(+) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 70208cd17c8a..acf615ac2a8f 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -608,6 +608,13 @@ buildinf.h: Makefile echo "static const char compiler_flags[] = \"compiler: ${COMPILER_TYPE}\";" ) \ > ${.TARGET} +buildasm cleanasm: +.for arch in aarch64 amd64 arm i386 powerpc powerpc64 powerpc64le + make MK_AUTO_OBJ=no -DWITHOUT_AUTO_ASM -DASM_${arch} \ + -f ${.CURDIR}/Makefile.asm -C ${SRCTOP}/sys/crypto/openssl/${arch} \ + ${.TARGET:S/build/all/:S/asm$//} +.endfor + .include PICFLAG+= -DOPENSSL_PIC diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index a52e2979060a..b109fd7f7f4f 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -7,6 +7,7 @@ CFLAGS+= -DL_ENDIAN CFLAGS+= -DB_ENDIAN .endif +.ifndef WITHOUT_AUTO_ASM .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" ASM_${MACHINE_CPUARCH}= @@ -14,6 +15,7 @@ ASM_${MACHINE_CPUARCH}= ${MACHINE_ARCH} == "powerpc64le" ASM_${MACHINE_ARCH}= .endif +.endif .if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH}) CFLAGS+= -DOPENSSL_CPUID_OBJ