From nobody Fri Sep 08 20:56:40 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 4Rj7h90FHTz4sstd; Fri, 8 Sep 2023 20:56:41 +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 4Rj7h86tlMz4mYr; Fri, 8 Sep 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206601; 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=e+Ix68HaUYIBqD6fO2s3r2rJ0juni/kuOMg8MKqCHXI=; b=W9gEvxIw1WheCjP2myJvADvcGKPeSZFHeqqNXWSJL3IOoFiWqONF4PdEEyx3um8J8Rj1Jd 3zxhekJKN6MsUhoCi1keqkBQ2E4kXB4YwXZV3UWIE8Wtpm4IUee7eW8OZt0ivt762oDn9L TbP19LLmwzHUyuO01BWUpSEOdeN56wZJw2GQORsBiETW0NTlBtbUwvl2pnXsmr3mXsab+Q Bao2wcMYNOGGRqstmFh00wuiGWWLOX9FMofHxrupADqP3QcWusx0LmRp0m5EnZrIRYWR1V OYRTLo/LRQ5oOn8YsFPd0DEVpd1z9jzgVONE0kDTrVqAYZ7hTxuuoO24fpEziA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206601; a=rsa-sha256; cv=none; b=NeSiEHVvjfkIyzYha+lFXETlGweC83QrL0y0+UEEc4HjeIRlF0ItdZsxh7XQ1FgcBL7ACT vjLegKmFEEdspjHqVATb+yFefZKvZm+FprISPYQq5ZvBUIQqOo1LyKTV7ctyeYTVqDnUnh hBMFny6DV4nPbwxN0sWy/cLwP0jWXIUw9FB6LOMiVpdn+nU4eprGBD+l57wzH2BV4wN0Uq y/KNK6f8yghe1U/UJjE7e2M6H9i2XHvveoY3qDuLOIBBoH/wly/9gL4xRxHqfPJqxTCfax dnbqTEjlKY/UbWlL1iMBxAqzXM1cDepRouodYjGhTUamnbaEQo79brxw4kwaLw== 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=1694206601; 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=e+Ix68HaUYIBqD6fO2s3r2rJ0juni/kuOMg8MKqCHXI=; b=h9Uit4fVM9RIyMJzuthvpIQ6RFU3evG1W7kkwSt/u9qzC52+m5rANarW/2sAnZ3NT/bcG/ QW0Lyh+/XZj5e9f4EqCysk38nBO1yIAyOPnd5zeTvokZgJpctU1xFtQrBB9AepBL7CfPDb jUxqsj6UsvOLPnVurirFs6nByO76Uwrzn95B5ZOnLPQrS+6sqgFmRmsRihezONsA1G3KSF PB2G3vtWIBAw90Gxhy4tmDQE838YfGaMHX7oUR7njG/goeoquWWh/1JkaIP5ejJhuAprUr MBlXlSuPN4pm820I/msE2JaX+cGlyJrVZRPe6VJinVCptv6BK1VOs+9rAA1B7w== 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 4Rj7h85bzdzx37; Fri, 8 Sep 2023 20:56:40 +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 388KueHA007414; Fri, 8 Sep 2023 20:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KuefM007411; Fri, 8 Sep 2023 20:56:40 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:40 GMT Message-Id: <202309082056.388KuefM007411@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: ef81451d114e - stable/14 - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef81451d114ebae9f77e195534898b6c4061aa69 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ef81451d114ebae9f77e195534898b6c4061aa69 commit ef81451d114ebae9f77e195534898b6c4061aa69 Author: John Baldwin AuthorDate: 2023-08-29 21:39:54 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +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) --- 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 f4bd4a3247f3..ab9044ad67f9 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -606,6 +606,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