kbuild compatibility hack for separate-objdir O= builds

diff --git a/ChangeLog b/ChangeLog
index 4432ece4d029cdd9015e0b0e60cbe5ad46a4b5af..1c7b49da7487148e6b97b4b94a6ed036db746138 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-12  Frank Ch. Eigler  <fche@elastic.org>
+
+       * buildrun.cxx (compile_pass): Add ugly kbuild hack for hand-built
+       x86 kernels that are made with O= (separate object/module-building
+       directory).
+
 2008-08-12  David Smith  <dsmith@redhat.com>
 
        PR 6445 (partial)

diff --git a/buildrun.cxx b/buildrun.cxx
index c2ebdce59f38ec1aa3c956536e550de685a91c1e..159e1c6e540c3960254f605aa01c0f3cbd2a61bc 100644 (file)
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -87,6 +87,14 @@ compile_pass (systemtap_session& s)
 
   string module_cflags = "EXTRA_CFLAGS";
   o << module_cflags << " :=" << endl;
+
+  // XXX: This gruesome hack is needed on some kernels built with separate O=directory,
+  // where files like 2.6.27 x86's asm/mach-*/mach_mpspec.h are not found on the cpp path.
+  // This could be a bug in arch/x86/Makefile that names
+  //      mflags-y += -Iinclude/asm-x86/mach-default
+  // but that path does not exist in an O= build tree.
+  o << module_cflags << " += -Iinclude2/asm/mach-default" << endl;
+
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-hrtimer-rel.c, -DSTAPCONF_HRTIMER_REL,)" << endl;
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-inode-private.c, -DSTAPCONF_INODE_PRIVATE,)" << endl;
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-constant-tsc.c, -DSTAPCONF_CONSTANT_TSC,)" << endl;