Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / arch / xtensa / Makefile

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 95f836db38fa3129cd10f2574c2c8cdf1000df79..4bd1e14c6b908cca0fcf04d96a766ab10f372387 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -27,7 +27,10 @@ platform-$(CONFIG_XTENSA_PLATFORM_ISS)               := iss
 PLATFORM = $(platform-y)
 export PLATFORM
 
-CFLAGS         += -pipe -mlongcalls
+# temporarily until string.h is fixed
+KBUILD_CFLAGS += -ffreestanding
+
+KBUILD_CFLAGS += -pipe -mlongcalls
 
 KBUILD_DEFCONFIG := iss_defconfig
 
@@ -51,12 +54,12 @@ endif
 
 #
 
-LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 head-y         := arch/xtensa/kernel/head.o
 core-y         += arch/xtensa/kernel/ arch/xtensa/mm/
 ifneq ($(PLATFORM),)
-core-y         += arch/xtensa/platform-$(PLATFORM)/
+core-y         += arch/xtensa/platforms/$(PLATFORM)/
 endif
 libs-y         += arch/xtensa/lib/ $(LIBGCC)