From nobody Tue Aug 29 21:47:23 2023 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 4Rb1HH6qsbz4rFcH; Tue, 29 Aug 2023 21:47:23 +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 4Rb1HH4Rnbz3K8H; Tue, 29 Aug 2023 21:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693345643; 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=V/oSbCU639uIeDlf1zl7L4dOQ9VNY6rzrciuNpAE4yc=; b=QzEbrGDuX/nJvlhXWTgaawvbVEKPW9C7Kw27ZNeg7JjPh4NJ6nMaWWx+dBkBXQfUQT5kO9 zhy+lb8yxGfOD2y+vbjLlPi2lSM28zhQ9AsgOMAT3LgAQ68r5GMH8oRHMJ9eH94M+30gUw Jxup0dwRH602qVuDlc1ng/ulwW1PRU8KSVurYc2FmICcE1tqecrQqOyFW9iM06C6a2JPgS 8VsV9A8PWrGuG9wlw2SahfTCyb2xKqfFocr1lGqmp2AyczraHkwXWFLdEYknGF7LlBA6xd G/dg/iy5IlzLs8Q1tsDaKRcgMuoQDaDTje8L8YW0v139UtPbj8zZEygLco8t0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693345643; a=rsa-sha256; cv=none; b=t4zs7yudPBEgRa7NUcVpiCHzu0L2SNsfLrEqpZdlsp5jEGcM90lZl289PrtDFNb7C5nQIM pHHCc0DNEcKdNbyg38/Rqdxs4ilqDrGtifqSiBeXcmme2cA5T1w1L2RAfsrH+Tg1Nsf8yI +XIPlfGlIgy9QkkQHOV4eNOMkyx/BtFraSSef6Etq7kIhOZVKbrfuEfABjPOzxhdV8e5/f +0a/B2Smq92CgdZYG95J3C8mXdFjNviVp1bDIMWvEVva/TZAseL20lvD6Kg73c34mum2Ft r0EV+04QsSA4yMGaEXyyC3UUx90x9lBo9FPXdl89bfA1kAuB8LWnVNHLAu2Gfg== 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=1693345643; 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=V/oSbCU639uIeDlf1zl7L4dOQ9VNY6rzrciuNpAE4yc=; b=G38ksVkez0c6TNu4BM40vdNnJke9Aa0uUJGaKbxudV7T4lXhK8AkOF34ULog+RL2WiqQPl sj2thAH/JVQzJOpVEFsW8t/BsJqv7u6G79aN6UmJI48fWzR6AHFt+FXB09aneUjhte9PX5 3uURGMAlmXT1bsmJVOkPwW0oEkDzHyfrH0AlJKS4dJsL1rKbc40qtQpiezXQeVSQMI36UF kz+Vw7pGONHOD4RSZLYif64vmjoEr0g5PKDpJ9Od2CPfEC4JgYLKAFwJmm7zgNPgrEj9uC Aw6WZujcsipAkDo0HxFswKsSjnq1hf2e8G0wah09d2DrygYDn7AN8/nuMZrAjg== 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 4Rb1HH3CBRz17HJ; Tue, 29 Aug 2023 21:47:23 +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 37TLlNw5087704; Tue, 29 Aug 2023 21:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37TLlNBS087701; Tue, 29 Aug 2023 21:47:23 GMT (envelope-from git) Date: Tue, 29 Aug 2023 21:47:23 GMT Message-Id: <202308292147.37TLlNBS087701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 73653b72af65 - main - libcrypto: Add buildasm and cleanasm targets 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/main X-Git-Reftype: branch X-Git-Commit: 73653b72af65e294dcfedc43a8ea09b2137d72ed Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=73653b72af65e294dcfedc43a8ea09b2137d72ed commit 73653b72af65e294dcfedc43a8ea09b2137d72ed Author: John Baldwin AuthorDate: 2023-08-29 21:39:54 +0000 Commit: John Baldwin CommitDate: 2023-08-29 21:43:51 +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 --- 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