d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skein_block_asm.S: use #ifdef not .ifdef, for Clang IAS

Browse Source 
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
This commit is contained in:
Ed Maste 2020-06-05 18:37:04 +00:00
parent 007278ebf0
commit 16c0b6eef9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/crypto/skein/amd64/skein_block_asm.s
View File

@ -18,20 +18,21 @@ _MASK_ALL_ = (256+512+1024) #all three algorithm bits
_MAX_FRAME_ = 240 _MAX_FRAME_ = 240
# #
################# #################
.ifndef SKEIN_USE_ASM #ifndef SKEIN_USE_ASM
_USE_ASM_ = _MASK_ALL_ _USE_ASM_ = _MASK_ALL_
.else #else
_USE_ASM_ = SKEIN_USE_ASM _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 _SKEIN_LOOP = 2 #default is fully unrolled for 256/512, twice for 1024
.else #else
_SKEIN_LOOP = SKEIN_LOOP _SKEIN_LOOP = SKEIN_LOOP
.irp _NN_,%_SKEIN_LOOP #only display loop unrolling if default changed on command line .irp _NN_,%_SKEIN_LOOP #only display loop unrolling if default changed on command line
#.print "+++ SKEIN_LOOP = \_NN_" #.print "+++ SKEIN_LOOP = \_NN_"
.endr .endr
.endif #endif
# the unroll counts (0 --> fully unrolled) # the unroll counts (0 --> fully unrolled)
SKEIN_UNROLL_256 = (_SKEIN_LOOP / 100) % 10 SKEIN_UNROLL_256 = (_SKEIN_LOOP / 100) % 10
SKEIN_UNROLL_512 = (_SKEIN_LOOP / 10) % 10 SKEIN_UNROLL_512 = (_SKEIN_LOOP / 10) % 10