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

Commit 39664e2f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: merge bounds.h and asm-offsets.h rules 



The rules "cmd_bounds" and "cmd_offsets" are almost the same.
(The difference is only the include guards.)  They can be merged.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 34948e0b

Kbuild

+21 −39
Original line number Diff line number Diff line
@@ -5,19 +5,19 @@ 
# 2) Generate asm-offsets.h (may need bounds.h)

# 3) Check for missing system calls



#####

# 1) Generate bounds.h



bounds-file := include/generated/bounds.h



always  := $(bounds-file)

targets := $(bounds-file) kernel/bounds.s

# 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



quiet_cmd_bounds = GEN     $@

define cmd_bounds

quiet_cmd_offsets = GEN     $@

define cmd_offsets

	(set -e; \

	 echo "#ifndef __LINUX_BOUNDS_H__"; \

	 echo "#define __LINUX_BOUNDS_H__"; \

	 echo "#ifndef $2"; \

	 echo "#define $2"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \
@@ -30,6 +30,14 @@ define cmd_bounds 
	 echo "#endif" ) > $@

endef



#####

# 1) Generate bounds.h



bounds-file := include/generated/bounds.h



always  := $(bounds-file)

targets := $(bounds-file) kernel/bounds.s



# We use internal kbuild rules to avoid the "is up to date" message from make

kernel/bounds.s: kernel/bounds.c FORCE

	$(Q)mkdir -p $(dir $@)
@@ -37,7 +45,7 @@ kernel/bounds.s: kernel/bounds.c FORCE 


$(obj)/$(bounds-file): kernel/bounds.s Kbuild

	$(Q)mkdir -p $(dir $@)

	$(call cmd,bounds)

	$(call cmd,offsets,__LINUX_BOUNDS_H__)



#####

# 2) Generate asm-offsets.h
@@ -49,32 +57,6 @@ always += $(offsets-file) 
targets += $(offsets-file)

targets += arch/$(SRCARCH)/kernel/asm-offsets.s





# 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



quiet_cmd_offsets = GEN     $@

define cmd_offsets

	(set -e; \

	 echo "#ifndef __ASM_OFFSETS_H__"; \

	 echo "#define __ASM_OFFSETS_H__"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by Kbuild"; \

	 echo " *"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne $(sed-y) $<; \

	 echo ""; \

	 echo "#endif" ) > $@

endef



# We use internal kbuild rules to avoid the "is up to date" message from make

arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \

                                      $(obj)/$(bounds-file) FORCE
@@ -82,7 +64,7 @@ arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \ 
	$(call if_changed_dep,cc_s_c)



$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild

	$(call cmd,offsets)

	$(call cmd,offsets,__ASM_OFFSETS_H__)



#####

# 3) Check for missing system calls