[klibc] [PATCH 09/16] Fix asm includes for newer kernel sources.

[Mike Waychison]

Newer kernel sources have moved the include/asm-* directories for all
architectures over to arch/$(ARCH)/include/asm.  Update the klibc build system
to always include this directory in the include paths.

This should still work with older kernel sources as the include path directory
will simply be ignored in those cases.

Signed-off-by: Mike Waychison <mikew at google.com>
---
 scripts/Kbuild.klibc          |    3 +++
 usr/klibc/arch/ppc/MCONFIG    |    2 +-
 usr/klibc/arch/ppc64/MCONFIG  |    2 +-
 usr/klibc/arch/x86_64/MCONFIG |    3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
index cc7495d..32d49fa 100644
--- a/scripts/Kbuild.klibc
+++ b/scripts/Kbuild.klibc
@@ -75,6 +75,9 @@ KLIBCBITSIZE      :=
 KLIBCLDFLAGS      :=
 KLIBCCFLAGS       :=
 
+# Defaults for arch to override
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/$(KLIBCARCH)/include
+
 # Arch specific definitions for klibc
 include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
 
diff --git a/usr/klibc/arch/ppc/MCONFIG b/usr/klibc/arch/ppc/MCONFIG
index e973389..5530f40 100644
--- a/usr/klibc/arch/ppc/MCONFIG
+++ b/usr/klibc/arch/ppc/MCONFIG
@@ -23,7 +23,7 @@ KLIBCBITSIZE       = 32
 KLIBCSHAREDFLAGS     = -Ttext 0x0f800200
 
 # The kernel so far has both asm-ppc* and asm-powerpc.
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/$(KLIBCARCH)/include
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/powerpc/include
 
 # The asm include files live in asm-powerpc
 KLIBCASMARCH	= powerpc
diff --git a/usr/klibc/arch/ppc64/MCONFIG b/usr/klibc/arch/ppc64/MCONFIG
index eb2d07a..32e0281 100644
--- a/usr/klibc/arch/ppc64/MCONFIG
+++ b/usr/klibc/arch/ppc64/MCONFIG
@@ -20,7 +20,7 @@ KLIBCLDFLAGS      = -m elf64ppc
 KLIBCSHAREDFLAGS     = -Ttext 0x0f000200
 
 # The kernel so far has both asm-ppc* and asm-powerpc.
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/$(KLIBCARCH)/include
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/powerpc/include
 
 # The asm include files live in asm-powerpc
 KLIBCASMARCH	= powerpc
diff --git a/usr/klibc/arch/x86_64/MCONFIG b/usr/klibc/arch/x86_64/MCONFIG
index b40c627..ff58a18 100644
--- a/usr/klibc/arch/x86_64/MCONFIG
+++ b/usr/klibc/arch/x86_64/MCONFIG
@@ -35,5 +35,8 @@ KLIBCLDFLAGS      = -m elf_x86_64
 # Revert to the old max-page-size=0x100000 value.
 KLIBCSHAREDFLAGS     = -Ttext 0x00200200 -z max-page-size=0x100000
 
+# Asm includes for x86_64 are in the merged x86 tree
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)arch/x86/include
+
 # Additional asm- directories needed during installation
 ASMARCH = asm-i386