]> git.itanic.dy.fi Git - linux-stable/commit
crypto, x86: aesni - fix token pasting for clang
authorMichael Davidson <md@google.com>
Wed, 15 Mar 2017 22:36:00 +0000 (15:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Nov 2018 15:07:59 +0000 (16:07 +0100)
commit5039cea07546571f364b6edaefbe86213b593dd8
treed2a833b65cd523af2bcd8ca58cfff7b8bed09bc7
parent68cb70349a5f87e5083ce6014f1a4e9e7b6a0e18
crypto, x86: aesni - fix token pasting for clang

commit fdb2726f4e61c5e3abc052f547d5a5f6c0dc5504 upstream.

aes_ctrby8_avx-x86_64.S uses the C preprocessor for token pasting
of character sequences that are not valid preprocessor tokens.
While this is allowed when preprocessing assembler files it exposes
an incompatibilty between the clang and gcc preprocessors where
clang does not strip leading white space from macro parameters,
leading to the CONCAT(%xmm, i) macro expansion on line 96 resulting
in a token with a space character embedded in it.

While this could be resolved by deleting the offending space character,
the assembler is perfectly capable of doing the token pasting correctly
for itself so we can just get rid of the preprocessor macros.

Signed-off-by: Michael Davidson <md@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/crypto/aes_ctrby8_avx-x86_64.S