mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
alpha: fix modversions for strcpy() et.al.
On alpha str{n,}{cpy,cat}() implementations are playing fun games with shared chunks of code. The problem is, they are using direct branches and need to be next to each other. Currently it's done by building them in separate object files, then using ld -r to link those together. Unfortunately, genksyms machinery has no idea what to do with that - we have generated in arch/alpha/lib/.strcat.S.cmd, but there's nothing to propagate that into .stycpy.S.cmd, so modpost doesn't find anything for those symbols, resulting in WARNING: modpost: EXPORT symbol "strcpy" [vmlinux] version generation failed, symbol will not be versioned. Is "strcpy" prototyped in <asm/asm-prototypes.h>? WARNING: modpost: EXPORT symbol "strcat" [vmlinux] version generation failed, symbol will not be versioned. Is "strcat" prototyped in <asm/asm-prototypes.h>? WARNING: modpost: EXPORT symbol "strncpy" [vmlinux] version generation failed, symbol will not be versioned. Is "strncpy" prototyped in <asm/asm-prototypes.h>? WARNING: modpost: EXPORT symbol "strncat" [vmlinux] version generation failed, symbol will not be versioned. Is "strncat" prototyped in <asm/asm-prototypes.h>? spew on modversion-enabled builds (all 4 functions in question are in fact prototyped in asm-prototypes.h) Fixing doesn't require messing with kbuild, thankfully - just build one object (i.e. have sty{n,}cpy.S with includes of relevant *.S instead of playing with ld -r) and that's it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Paul E. McKenney <paulmck@kernel.org> Acked-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
5d75315174
commit
397c66c2c9
@ -44,17 +44,3 @@ AFLAGS___remlu.o = -DREM -DINTSIZE
|
||||
$(addprefix $(obj)/,__divqu.o __remqu.o __divlu.o __remlu.o): \
|
||||
$(src)/$(ev6-y)divide.S FORCE
|
||||
$(call if_changed_rule,as_o_S)
|
||||
|
||||
# There are direct branches between {str*cpy,str*cat} and stx*cpy.
|
||||
# Ensure the branches are within range by merging these objects.
|
||||
|
||||
LDFLAGS_stycpy.o := -r
|
||||
LDFLAGS_styncpy.o := -r
|
||||
|
||||
$(obj)/stycpy.o: $(obj)/strcpy.o $(obj)/$(ev67-y)strcat.o \
|
||||
$(obj)/$(ev6-y)stxcpy.o FORCE
|
||||
$(call if_changed,ld)
|
||||
|
||||
$(obj)/styncpy.o: $(obj)/strncpy.o $(obj)/$(ev67-y)strncat.o \
|
||||
$(obj)/$(ev6-y)stxncpy.o FORCE
|
||||
$(call if_changed,ld)
|
||||
|
11
arch/alpha/lib/stycpy.S
Normal file
11
arch/alpha/lib/stycpy.S
Normal file
@ -0,0 +1,11 @@
|
||||
#include "strcpy.S"
|
||||
#ifdef CONFIG_ALPHA_EV67
|
||||
#include "ev67-strcat.S"
|
||||
#else
|
||||
#include "strcat.S"
|
||||
#endif
|
||||
#ifdef CONFIG_ALPHA_EV6
|
||||
#include "ev6-stxcpy.S"
|
||||
#else
|
||||
#include "stxcpy.S"
|
||||
#endif
|
11
arch/alpha/lib/styncpy.S
Normal file
11
arch/alpha/lib/styncpy.S
Normal file
@ -0,0 +1,11 @@
|
||||
#include "strncpy.S"
|
||||
#ifdef CONFIG_ALPHA_EV67
|
||||
#include "ev67-strncat.S"
|
||||
#else
|
||||
#include "strncat.S"
|
||||
#endif
|
||||
#ifdef CONFIG_ALPHA_EV6
|
||||
#include "ev6-stxncpy.S"
|
||||
#else
|
||||
#include "stxncpy.S"
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user