Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf0c3e68 authored by Jeroen Hofstee's avatar Jeroen Hofstee Committed by Masahiro Yamada
Browse files

kbuild: fix asm-offset generation to work with clang 

KBuild abuses the asm statement to write to a file and
clang chokes about these invalid asm statements. Hack it
even more by fooling this is actual valid asm code.

[masahiro:
 Import Jeroen's work for U-Boot:
 http://patchwork.ozlabs.org/patch/375026/


 Tweak sed script a little to avoid garbage '#' for GCC case, like
 #define NR_PAGEFLAGS 23 /* __NR_PAGEFLAGS       # */ ]

Signed-off-by: default avatarJeroen Hofstee <jeroen@myspectrum.nl>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
parent 7dd47b95

include/linux/kbuild.h

+3 −3
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 
#define __LINUX_KBUILD_H



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))

	asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val))



#define BLANK() asm volatile("\n->" : : )

#define BLANK() asm volatile("\n.ascii \"->\"" : : )



#define OFFSET(sym, str, mem) \

	DEFINE(sym, offsetof(struct str, mem))



#define COMMENT(x) \

	asm volatile("\n->#" x)

	asm volatile("\n.ascii \"->#" x "\"")



#endif

scripts/Makefile.lib

+6 −2
Original line number Diff line number Diff line
@@ -413,10 +413,14 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ 
# ---------------------------------------------------------------------------



# Default sed regexp - multiline due to syntax constraints

#

# Use [:space:] because LLVM's integrated assembler inserts <tab> around

# the .ascii directive whereas GCC keeps the <space> as-is.

define sed-offsets

	"/^->/{s:->#\(.*\):/* \1 */:; \

	's:^[[:space:]]*\.ascii[[:space:]]*"\(.*\)".*:\1:; \

	/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

	s:->::; p;}'

endef



# Use filechk to avoid rebuilds when a header changes, but the resulting file