Re: [PATCH 2.6.26-rc5 2/2] cris: compile fixes for 2.6.26-rc5

["Hinko Kočevar" <hinko.kocevar@cetrtapot.si>]

[-- Attachment #1: Type: text/plain, Size: 130 bytes --]

Make compile succeed when building with O= (srctree != objtree).

Signed-off-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si>

---


[-- Attachment #2: 002-cris-compile-with-src-ne-obj-dir.patch --]
[-- Type: text/x-patch, Size: 1059 bytes --]

diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
index 4a031cb..89ad821 100644
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -5,7 +5,7 @@
 CC = gcc-cris -melf $(LINUXINCLUDE)
 ccflags-y += -O2
 LD = ld-cris
-ldflags-y += -T $(obj)/decompress.ld
+ldflags-y += -T $(srctree)/$(src)/decompress.ld
 OBJECTS = $(obj)/head.o $(obj)/misc.o
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
index 2e5045b..32b9a91 100644
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -6,7 +6,7 @@ CC = gcc-cris -mlinux $(LINUXINCLUDE)
 ccflags-y += -O2
 asflags-y += -traditional
 LD = gcc-cris -mlinux -nostdlib
-ldflags-y += -T $(obj)/rescue.ld
+ldflags-y += -T $(srctree)/$(src)/rescue.ld
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o