Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 5 Jun 2020 18:37:05 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r361843 - head/sys/crypto/skein/amd64
Message-ID:  <202006051837.055Ib5ro097743@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006051837.055Ib5ro097743>