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

Commit 048eb582 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: mips use generic asm-offsets.h support 



Removed obsolete stuff from arch makefile.
mips had a special rule for generating asm-offsets.h so preserved it
using an architecture specific hook in top-level Kbuild file.
Renamed .h file to asm-offsets.h

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 39e01cb8

Kbuild

+8 −1
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ always := $(offsets-file) 
targets := $(offsets-file)

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



# Default sed regexp - multiline due to syntax constraints

define sed-y

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

endef

# Override default regexp for specific architectures

sed-$(CONFIG_MIPS) := "/^@@@/s///p"



quiet_cmd_offsets = GEN     $@

define cmd_offsets

	cat $< | \
@@ -26,7 +33,7 @@ define cmd_offsets 
	 echo " *"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \

	 sed -ne $(sed-y); \

	 echo ""; \

	 echo "#endif" ) > $@

endef

arch/mips/Makefile

+2 −33
Original line number Diff line number Diff line
@@ -720,38 +720,7 @@ archclean: 
	@$(MAKE) $(clean)=arch/mips/boot

	@$(MAKE) $(clean)=arch/mips/lasat



# Generate <asm/offset.h

#

# The default rule is suffering from funny problems on MIPS so we using our

# own ...

#

# ---------------------------------------------------------------------------



define filechk_gen-asm-offset.h

	(set -e; \

	 echo "#ifndef _ASM_OFFSET_H"; \

	 echo "#define _ASM_OFFSET_H"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by arch/$(ARCH)/Makefile"; \

	 echo " *"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne "/^@@@/s///p"; \

	 echo "#endif /* _ASM_OFFSET_H */" )

endef



prepare: include/asm-$(ARCH)/offset.h



arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \

				   include/config/MARKER



include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s

	$(call filechk,gen-asm-offset.h)



CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \

	       include/asm-$(ARCH)/offset.h \

	       vmlinux.32 \



CLEAN_FILES += vmlinux.32 \

	       vmlinux.64 \

	       vmlinux.ecoff

arch/mips/kernel/r2300_fpu.S

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/errno.h>

#include <asm/fpregdef.h>

#include <asm/mipsregs.h>

#include <asm/offset.h>

#include <asm/asm-offsets.h>

#include <asm/regdef.h>



#define EX(a,b)							\

arch/mips/kernel/r2300_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/cachectl.h>

#include <asm/fpregdef.h>

#include <asm/mipsregs.h>

#include <asm/offset.h>

#include <asm/asm-offsets.h>

#include <asm/page.h>

#include <asm/regdef.h>

#include <asm/stackframe.h>

arch/mips/kernel/r4k_fpu.S

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/errno.h>

#include <asm/fpregdef.h>

#include <asm/mipsregs.h>

#include <asm/offset.h>

#include <asm/asm-offsets.h>

#include <asm/regdef.h>



	.macro	EX insn, reg, src