summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-08-12 12:57:01 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-08-12 12:57:01 -0400
commit84c4da88c7a995033b2a06fcc10e485222b54b11 (patch)
tree0b6f28ae02fd46be37d918166f68e2552314f58b
parent6cdf2889024b6538665a00f2ecd7321626624bb8 (diff)
downloadsystemtap-steved-84c4da88c7a995033b2a06fcc10e485222b54b11.tar.gz
systemtap-steved-84c4da88c7a995033b2a06fcc10e485222b54b11.tar.xz
systemtap-steved-84c4da88c7a995033b2a06fcc10e485222b54b11.zip
kbuild compatibility hack for separate-objdir O= builds
-rw-r--r--ChangeLog6
-rw-r--r--buildrun.cxx8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4432ece4..1c7b49da 100644
--- 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 c2ebdce5..159e1c6e 100644
--- 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;