+ kbuild-simpler-generation-of-assembly-constants.patch added to -mm tree
Subsystems (3)
[email protected]
tree noticeThe patch titled
Subject: kbuild: simpler generation of assembly constants
has been added to the -mm tree. Its filename is
kbuild-simpler-generation-of-assembly-constants.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/kbuild-simpler-generation-of-assembly-constants.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/kbuild-simpler-generation-of-assembly-constants.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: kbuild: simpler generation of assembly constants
gcc doesn't really look inside "asm" statements and more or less directly emits it into assembly. So pretend "#define" is CPU instruction.
Also, use C++ comment to block whatever garbage is put at the end of the line by compiler.
Signed-off-by Alexey Dobriyan <[email protected]>
Cc Michal Marek <[email protected]>
Cc "Luck, Tony" <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
Kbuild | 12 +----------- arch/ia64/kernel/Makefile | 8 +------- include/linux/kbuild.h | 2 +- scripts/mod/Makefile | 11 +---------- 4 files changed, 4 insertions(+), 29 deletions(-)
Kbuild renamed from Kbuild~kbuild-simpler-generation-of-assembly-constants +1 -11
@@ -7,14 +7,6 @@ # 4) Check for missing system calls # 5) Generate constants.py (may need bounds.h) -# Default sed regexp - multiline due to syntax constraints -define sed-y - "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef - # Use filechk to avoid rebuilds when a header changes, but the resulting file # does not define filechk_offsets
@@ -26,9 +18,7 @@ define filechk_offsets echo " *"; \ echo " * This file was generated by Kbuild"; \ echo " */"; \ - echo ""; \ - sed -ne $(sed-y); \ - echo ""; \ + sed -ne '/#define/{s/\$$//;s/#//2;p;}'; \ echo "#endif" ) endef
arch/ia64/kernel/Makefile renamed from arch/ia64/kernel/Makefile~kbuild-simpler-generation-of-assembly-constants +1 -7
@@ -50,10 +50,6 @@ CFLAGS_traps.o += -mfixed-range=f2-f5,f # The gate DSO image is built using a special linker script. include $(src)/Makefile.gate -# Calculate NR_IRQ = max(IA64_NATIVE_NR_IRQS, XEN_NR_IRQS, ...) based on config -define sed-y - "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" -endef quiet_cmd_nr_irqs = GEN $@ define cmd_nr_irqs (set -e; \
@@ -65,9 +61,7 @@ define cmd_nr_irqs echo " * This file was generated by Kbuild"; \ echo " *"; \ echo " */"; \ - echo ""; \ - sed -ne $(sed-y) $<; \ - echo ""; \ + sed -ne '/#define/{s/\$$//;s/#//2;p;}' $<; \ echo "#endif" ) > $@ endef
include/linux/kbuild.h renamed from include/linux/kbuild.h~kbuild-simpler-generation-of-assembly-constants +1 -1
@@ -2,7 +2,7 @@#define __LINUX_KBUILD_H#define DEFINE (sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile ("#define " #sym " %0 //" #val :: "i" (val))#define BLANK () asm volatile("\n->" : : )
scripts/mod/Makefile renamed from scripts/mod/Makefile~kbuild-simpler-generation-of-assembly-constants +0 -6
@@ -7,13 +7,6 @@ modpost-objs := modpost.o file2alias.o s devicetable-offsets-file := devicetable-offsets.h -define sed-y - "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef
PATCH v3 1/1 kbuild: simpler generation of assembly constants
gcc doesn't really look inside "asm" statements and more or less directly emits it into assembly. So pretend "#define" is CPU instruction.
C++ comment can't be used because sparc assembler doesn't understand it.
Signed-off-by Alexey Dobriyan <[email protected]>
---
This one compiles on Sparc and UML.
Kbuild | 12 +----------- arch/ia64/kernel/Makefile | 8 +------- arch/um/Makefile | 2 +- arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- arch/x86/um/user-offsets.c | 4 ++-- include/linux/kbuild.h | 2 +- scripts/mod/Makefile | 11 +---------- 7 files changed, 8 insertions(+), 33 deletions(-)
Kbuild +1 -11
@@ -7,14 +7,6 @@ # 4) Check for missing system calls # 5) Generate constants.py (may need bounds.h) -# Default sed regexp - multiline due to syntax constraints -define sed-y - "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef - # Use filechk to avoid rebuilds when a header changes, but the resulting file # does not define filechk_offsets
@@ -26,9 +18,7 @@ define filechk_offsets echo " *"; \ echo " * This file was generated by Kbuild"; \ echo " */"; \ - echo ""; \ - sed -ne $(sed-y); \ - echo ""; \ + sed -ne '/#define/{s/\$$//;s/#//2;s/$$/*\//;p;}'; \ echo "#endif" ) endef
arch/ia64/kernel/Makefile +1 -7
@@ -50,10 +50,6 @@ CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31 # The gate DSO image is built using a special linker script. include $(src)/Makefile.gate -# Calculate NR_IRQ = max(IA64_NATIVE_NR_IRQS, XEN_NR_IRQS, ...) based on config -define sed-y - "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" -endef quiet_cmd_nr_irqs = GEN $@ define cmd_nr_irqs (set -e; \
@@ -65,9 +61,7 @@ define cmd_nr_irqs echo " * This file was generated by Kbuild"; \ echo " *"; \ echo " */"; \ - echo ""; \ - sed -ne $(sed-y) $<; \ - echo ""; \ + sed -ne '/#define/{s/\$$//;s/#//2;s/$$/*\//p;}' $<; \ echo "#endif" ) > $@ endef
arch/um/Makefile +1 -1
@@ -158,7 +158,7 @@ define filechk_gen-asm-offsets echo " *"; \ echo " */"; \ echo ""; \ - sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \ + sed -ne '/#define/{s/\$$//;s/#//2;s/$$/*\//p;}'; \ echo ""; ) endef
arch/x86/um/shared/sysdep/kernel-offsets.h +1 -1
@@ -5,7 +5,7 @@#include <asm/mman.h> #define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile ("#define " #sym " %0 /*" #val :: "i" (val))#define BLANK () asm volatile("\n->" : : )
arch/x86/um/user-offsets.c +2 -2
@@ -21,10 +21,10 @@ static char syscalls[] = {#endif #define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile ("#define " #sym " %0 /*" #val :: "i" (val)) #define DEFINE_LONGS(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long))) + asm volatile ("#define " #sym " %0 /*" #val :: "i" (val / sizeof(unsigned long))) void foo(void) {
include/linux/kbuild.h +1 -1
@@ -2,7 +2,7 @@#define __LINUX_KBUILD_H #define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile ("#define " #sym " %0 /*" #val :: "i" (val))#define BLANK () asm volatile("\n->" : : )
scripts/mod/Makefile +1 -10
@@ -7,13 +7,6 @@ modpost-objs := modpost.o file2alias.o sumversion.o devicetable-offsets-file := devicetable-offsets.h -define sed-y - "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef - quiet_cmd_offsets = GEN $@ define cmd_offsets (set -e; \
@@ -25,9 +18,7 @@ define cmd_offsets echo " * This file was generated by Kbuild"; \ echo " *"; \ echo " */"; \ - echo ""; \ - sed -ne $(sed-y) $<; \ - echo ""; \ + sed -ne '/#define/{s/\$$//;s/#//2;s/$$/*\//;p;}' $<; \ echo "#endif" ) > $@ endef