No longer compiles on 5.4.76
Hello,
Building kernel 5.4.76 with WireGuard v1.0.20200908 fails for me now with:
AS [M] net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o
In file included from <command-line>:././net/wireguard/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
#define SYM_FUNC_START ENTRY
In file included from ././net/wireguard/compat/compat-asm.h:9,
from <command-line>:./include/linux/linkage.h:218: note: this is the location of the previous definition
#define SYM_FUNC_START(name) \
In file included from <command-line>:././net/wireguard/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
#define SYM_FUNC_END ENDPROC
In file included from ././net/wireguard/compat/compat-asm.h:9,
from <command-line>:./include/linux/linkage.h:265: note: this is the location of the previous definition
#define SYM_FUNC_END(name) \
net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S: Assembler messages:net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:123: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:185: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:187: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:319: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1016: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1616: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1620: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1810: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1812: Error: invalid character '(' in mnemonic net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1959: Error: invalid character '(' in mnemonic
CC [M] drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.oscripts/Makefile.build:348: recipe for target 'net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o' failed make[3]: *** [net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o] Error 1 scripts/Makefile.build:500: recipe for target 'net/wireguard' failed
make[2]: *** [net/wireguard] Error 2
Signature · 2 lines
With respect, Roman
Roman Mamedov
Acked-by Rafael J. WysockiQuoted 23 lines · On Tue, 10 Nov 2020 18:56:56 +0500 Roman Mamedov <[email protected]> wrote:
Hello,
Building kernel 5.4.76 with WireGuard v1.0.20200908 fails for me now with:
AS [M]
net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o
In file included from <command-line>:././net/wireguard/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
#defineSYM_FUNC_STARTENTRYIn file included from
././net/wireguard/compat/compat-asm.h:9,
from <command-line>:./include/linux/linkage.h:218: note: this is the location of the previous definition
#defineSYM_FUNC_START(name)\In file included from <command-line>:
././net/wireguard/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
#defineSYM_FUNC_ENDENDPROCIn file included from
././net/wireguard/compat/compat-asm.h:9,
from <command-line>:./include/linux/linkage.h:265: note: this is the location of the previous definition
#defineSYM_FUNC_END(name)\
Quoted 16 lines
net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S: Assembler messages:net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:123: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:185: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:187: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:319: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1016: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1616: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1620: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1810: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1812: Error: invalid character '(' in mnemonicnet/wireguard/crypto/zinc/chacha20/chacha20-x86_64.S:1959: Error: invalid character '(' in mnemonic
CC [M]drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.oscripts/Makefile.build:348: recipe for target 'net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o' failed make[3]: *** [net/wireguard/crypto/zinc/chacha20/chacha20-x86_64.o] Error 1scripts/Makefile.build:500: recipe for target 'net/wireguard' failed
make[2]: *** [net/wireguard] Error 2
Seems related to:
commit 840d8c9b3e5f51d1005256e6c63eab4f81cbebfb
Author: Jiri Slaby <[email protected]> Date: Fri Oct 11 13:50:41 2019 +0200
linkage: Introduce new macros for assembler symbols
commit ffedeeb780dc554eff3d3b16e6a462a26a41d7ec upstream.
Introduce new C macros for annotations of functions and data in assembly. There is a long-standing mess in macros like ENTRY, END, ENDPROC and similar. They are used in different manners and sometimes incorrectly.
So introduce macros with clear use to annotate assembly as follows:
a) Support macros for the ones below
SYM_T_FUNC -- type used by assembler to mark functions SYM_T_OBJECT -- type used by assembler to mark data SYM_T_NONE -- type used by assembler to mark entries of unknown type
They are defined as STT_FUNC, STT_OBJECT, and STT_NOTYPE respectively. According to the gas manual, this is the most portable way. I am not sure about other assemblers, so this can be switched back to %function and %object if this turns into a problem. Architectures can also override them by something like ", @function" if they need.
SYM_A_ALIGN, SYM_A_NONE -- align the symbol? SYM_L_GLOBAL, SYM_L_WEAK, SYM_L_LOCAL -- linkage of symbols
b) Mostly internal annotations, used by the ones below SYM_ENTRY -- use only if you have to (for non-paired symbols) SYM_START -- use only if you have to (for paired symbols) SYM_END -- use only if you have to (for paired symbols)
c) Annotations for code
SYM_INNER_LABEL_ALIGN -- only for labels in the middle of code SYM_INNER_LABEL -- only for labels in the middle of code
SYM_FUNC_START_LOCAL_ALIAS -- use where there are two local names for
one function
SYM_FUNC_START_ALIAS -- use where there are two global names for one
function
SYM_FUNC_END_ALIAS -- the end of LOCAL_ALIASed or ALIASed function
SYM_FUNC_START -- use for global functions SYM_FUNC_START_NOALIGN -- use for global functions, w/o alignment SYM_FUNC_START_LOCAL -- use for local functions SYM_FUNC_START_LOCAL_NOALIGN -- use for local functions, w/o
alignment
SYM_FUNC_START_WEAK -- use for weak functions SYM_FUNC_START_WEAK_NOALIGN -- use for weak functions, w/o alignment SYM_FUNC_END -- the end of SYM_FUNC_START_LOCAL, SYM_FUNC_START,
SYM_FUNC_START_WEAK, ...
For functions with special (non-C) calling conventions:
SYM_CODE_START -- use for non-C (special) functions SYM_CODE_START_NOALIGN -- use for non-C (special) functions, w/o
alignment
SYM_CODE_START_LOCAL -- use for local non-C (special) functions SYM_CODE_START_LOCAL_NOALIGN -- use for local non-C (special)
functions, w/o alignment
SYM_CODE_END -- the end of SYM_CODE_START_LOCAL or SYM_CODE_START
d) For data
SYM_DATA_START -- global data symbol SYM_DATA_START_LOCAL -- local data symbol SYM_DATA_END -- the end of the SYM_DATA_START symbol SYM_DATA_END_LABEL -- the labeled end of SYM_DATA_START symbol SYM_DATA -- start+end wrapper around simple global data SYM_DATA_LOCAL -- start+end wrapper around simple local data
==========
The macros allow to pair starts and ends of functions and mark functions correctly in the output ELF objects.
All users of the old macros in x86 are converted to use these in further patches.
---------------
It appears the following will fix it, applied and restarted my build now.
src/compat/compat-asm.h +1 -1
@@ -40,7 +40,7 @@#undef pull#endif -#if LINUX_VERSION_CODE <KERNEL_VERSION (5 ,5 ,0 ) +#if LINUX_VERSION_CODE <KERNEL_VERSION (5 ,4 ,76 )#define SYM_FUNC_START ENTRY#define SYM_FUNC_END ENDPROC#endif
Jason A. Donenfeld
AppliedThanks! Applied. I'll have a new release out today.