From owner-svn-src-head@freebsd.org Fri Jun 5 18:37:05 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4DC8D333F2A; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49drwK1N1Sz4Wl4; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A5081543C; Fri, 5 Jun 2020 18:37:05 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055Ib5Zc097744; Fri, 5 Jun 2020 18:37:05 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055Ib5ro097743; Fri, 5 Jun 2020 18:37:05 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006051837.055Ib5ro097743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 5 Jun 2020 18:37:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361843 - head/sys/crypto/skein/amd64 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/crypto/skein/amd64 X-SVN-Commit-Revision: 361843 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 18:37:05 -0000 Author: emaste Date: Fri Jun 5 18:37:04 2020 New Revision: 361843 URL: https://svnweb.freebsd.org/changeset/base/361843 Log: skein_block_asm.S: use #ifdef not .ifdef, for Clang IAS Clang IAS does not support the --defsym argument, and .ifndef SKEIN_USE_ASM gets turned into .ifndef 1792 by the preprocessor, which results in error: expected identifier after '.ifdef' .ifndef 1792 ^ Use #ifdef instead, which still works with GNU as. Reviewed by: cem Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25154 Modified: head/sys/crypto/skein/amd64/skein_block_asm.s Modified: head/sys/crypto/skein/amd64/skein_block_asm.s ============================================================================== --- head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 18:18:27 2020 (r361842) +++ head/sys/crypto/skein/amd64/skein_block_asm.s Fri Jun 5 18:37:04 2020 (r361843) @@ -18,20 +18,21 @@ _MASK_ALL_ = (256+512+1024) #all three _MAX_FRAME_ = 240 # ################# -.ifndef SKEIN_USE_ASM +#ifndef SKEIN_USE_ASM _USE_ASM_ = _MASK_ALL_ -.else +#else _USE_ASM_ = SKEIN_USE_ASM -.endif +#endif ################# -.ifndef SKEIN_LOOP #configure loop unrolling +#configure loop unrolling +#ifndef SKEIN_LOOP _SKEIN_LOOP = 2 #default is fully unrolled for 256/512, twice for 1024 -.else +#else _SKEIN_LOOP = SKEIN_LOOP .irp _NN_,%_SKEIN_LOOP #only display loop unrolling if default changed on command line #.print "+++ SKEIN_LOOP = \_NN_" .endr -.endif +#endif # the unroll counts (0 --> fully unrolled) SKEIN_UNROLL_256 = (_SKEIN_LOOP / 100) % 10 SKEIN_UNROLL_512 = (_SKEIN_LOOP / 10) % 10