kbuild: arm26,sparc use generic asm-offset support
Rename all includes to use asm-offsets.h to match generic name Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
cca6e6f5f4
commit
47003497dd
@ -49,10 +49,6 @@ all: zImage
|
|||||||
|
|
||||||
boot := arch/arm26/boot
|
boot := arch/arm26/boot
|
||||||
|
|
||||||
prepare: include/asm-$(ARCH)/asm_offsets.h
|
|
||||||
CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
|
|
||||||
|
|
||||||
|
|
||||||
.PHONY: maketools FORCE
|
.PHONY: maketools FORCE
|
||||||
maketools: FORCE
|
maketools: FORCE
|
||||||
|
|
||||||
@ -94,12 +90,6 @@ zi:; $(Q)$(MAKE) $(build)=$(boot) zinstall
|
|||||||
fi; \
|
fi; \
|
||||||
)
|
)
|
||||||
|
|
||||||
arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
|
|
||||||
include/config/MARKER
|
|
||||||
|
|
||||||
include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
|
|
||||||
$(call filechk,gen-asm-offsets)
|
|
||||||
|
|
||||||
define archhelp
|
define archhelp
|
||||||
echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
|
echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
|
||||||
echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
|
echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
|
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/hardware.h>
|
#include <asm/hardware.h>
|
||||||
#include <asm/sysirq.h>
|
#include <asm/sysirq.h>
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
*/
|
*/
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
|
||||||
.text
|
.text
|
||||||
.align 5
|
.align 5
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
|
||||||
.text
|
.text
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
* Note that ADDR_LIMIT is either 0 or 0xc0000000.
|
* Note that ADDR_LIMIT is either 0 or 0xc0000000.
|
||||||
* Note also that it is intended that __get_user_bad is not global.
|
* Note also that it is intended that __get_user_bad is not global.
|
||||||
*/
|
*/
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/thread_info.h>
|
#include <asm/thread_info.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
* Note that ADDR_LIMIT is either 0 or 0xc0000000
|
* Note that ADDR_LIMIT is either 0 or 0xc0000000
|
||||||
* Note also that it is intended that __put_user_bad is not global.
|
* Note also that it is intended that __put_user_bad is not global.
|
||||||
*/
|
*/
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/thread_info.h>
|
#include <asm/thread_info.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
*/
|
*/
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/procinfo.h>
|
#include <asm/procinfo.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
|
||||||
/* This is the kernel's entry point into the floating point emulator.
|
/* This is the kernel's entry point into the floating point emulator.
|
||||||
It is called from the kernel with code similar to this:
|
It is called from the kernel with code similar to this:
|
||||||
|
@ -59,17 +59,7 @@ image tftpboot.img: vmlinux
|
|||||||
archclean:
|
archclean:
|
||||||
$(Q)$(MAKE) $(clean)=$(boot)
|
$(Q)$(MAKE) $(clean)=$(boot)
|
||||||
|
|
||||||
prepare: include/asm-$(ARCH)/asm_offsets.h
|
CLEAN_FILES += arch/$(ARCH)/boot/System.map
|
||||||
|
|
||||||
arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
|
|
||||||
include/config/MARKER
|
|
||||||
|
|
||||||
include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
|
|
||||||
$(call filechk,gen-asm-offsets)
|
|
||||||
|
|
||||||
CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \
|
|
||||||
arch/$(ARCH)/kernel/asm-offsets.s \
|
|
||||||
arch/$(ARCH)/boot/System.map
|
|
||||||
|
|
||||||
# Don't use tabs in echo arguments.
|
# Don't use tabs in echo arguments.
|
||||||
define archhelp
|
define archhelp
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <asm/kgdb.h>
|
#include <asm/kgdb.h>
|
||||||
#include <asm/contregs.h>
|
#include <asm/contregs.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/psr.h>
|
#include <asm/psr.h>
|
||||||
#include <asm/vaddrs.h>
|
#include <asm/vaddrs.h>
|
||||||
#include <asm/memreg.h>
|
#include <asm/memreg.h>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/winmacro.h>
|
#include <asm/winmacro.h>
|
||||||
#include <asm/thread_info.h>
|
#include <asm/thread_info.h>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/psr.h>
|
#include <asm/psr.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/asi.h>
|
#include <asm/asi.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
#include <asm/pgtsrmmu.h>
|
#include <asm/pgtsrmmu.h>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <asm/asi.h>
|
#include <asm/asi.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
#include <asm/pgtsrmmu.h>
|
#include <asm/pgtsrmmu.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
|
||||||
.text
|
.text
|
||||||
.align 4
|
.align 4
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/psr.h>
|
#include <asm/psr.h>
|
||||||
#include <asm/asi.h>
|
#include <asm/asi.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/psr.h>
|
#include <asm/psr.h>
|
||||||
#include <asm/asm_offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/asi.h>
|
#include <asm/asi.h>
|
||||||
#include <asm/mxcc.h>
|
#include <asm/mxcc.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
@ -73,11 +73,11 @@ extern void show_regs(struct pt_regs *);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The asm_offsets.h is a generated file, so we cannot include it.
|
* The asm-offsets.h is a generated file, so we cannot include it.
|
||||||
* It may be OK for glibc headers, but it's utterly pointless for C code.
|
* It may be OK for glibc headers, but it's utterly pointless for C code.
|
||||||
* The assembly code using those offsets has to include it explicitly.
|
* The assembly code using those offsets has to include it explicitly.
|
||||||
*/
|
*/
|
||||||
/* #include <asm/asm_offsets.h> */
|
/* #include <asm/asm-offsets.h> */
|
||||||
|
|
||||||
/* These are for pt_regs. */
|
/* These are for pt_regs. */
|
||||||
#define PT_PSR 0x0
|
#define PT_PSR 0x0
|
||||||
|
Loading…
Reference in New Issue
Block a user