Merge asm-offsets.c for both arches into one file.

Eliminates the link to arch specific asm-offsets.c from CRIS architecture build system.

Resulting asm-offsets.s are identical before and after change for both arch-v10 and arch-v32.

---
 arch/cris/Makefile                      |    6 +--
 arch/cris/arch-v10/kernel/asm-offsets.c |   47 ----------------------
 arch/cris/arch-v32/kernel/asm-offsets.c |   49 -----------------------
 arch/cris/kernel/asm-offsets.c          |   64 +++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 100 deletions(-)
 delete mode 100644 arch/cris/arch-v10/kernel/asm-offsets.c
 delete mode 100644 arch/cris/arch-v32/kernel/asm-offsets.c
 create mode 100644 arch/cris/kernel/asm-offsets.c

index 22825a7..241e35b 100644
@@ -95,8 +95,6 @@ ifdef CONFIG_ETRAX_ARCH_V32
 endif
 	@rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S
 	@ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
-	@rm -rf $(SRC_ARCH)/kernel/asm-offsets.c
-	@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
 	@touch $@
 
 archclean:

@@ -116,8 +114,8 @@ MRPROPER_FILES += \
 	$(SRC_ARCH)/boot \
 	$(SRC_ARCH)/lib \
 	$(SRC_ARCH)/arch \
-	$(SRC_ARCH)/kernel/vmlinux.lds.S \
-	$(SRC_ARCH)/kernel/asm-offsets.c
+	$(SRC_ARCH)/kernel/vmlinux.lds.S
+
 
 define archhelp
   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

1.5.6.5


/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- [email protected]