diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-01-23 14:28:47 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-01-23 14:28:47 +0100 |
| commit | c3bad3042df505a3470f1e20b09822a9df1d4761 (patch) | |
| tree | 6842e8eaa705e406379d34cf07a85431b6d71344 /buildrun.cxx | |
| parent | 750b1f2f5c84acaf0776de5239dc81e2e95c1dec (diff) | |
| parent | f120873cb40cfc16cc94f06fd722abc927b96227 (diff) | |
| download | systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.gz systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.xz systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.zip | |
Merge branch 'master' into pr6866.
Diffstat (limited to 'buildrun.cxx')
| -rw-r--r-- | buildrun.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/buildrun.cxx b/buildrun.cxx index ece9eda4..c626cf2a 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -82,8 +82,11 @@ compile_pass (systemtap_session& s) if (s.verbose > 6) redirecterrors = ""; + // Support O= (or KBUILD_OUTPUT) option + o << "_KBUILD_CFLAGS := $(call flags,KBUILD_CFLAGS)" << endl; + o << "stap_check_gcc = $(shell " << superverbose << " if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl; - o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) " << redirecterrors << " ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl; + o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(LINUXINCLUDE) $(_KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) " << redirecterrors << " ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl; o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl; @@ -99,6 +102,10 @@ compile_pass (systemtap_session& s) // but that path does not exist in an O= build tree. o << module_cflags << " += -Iinclude2/asm/mach-default" << endl; + // NB: don't try + // o << module_cflags << " += -Iusr/include" << endl; + // since such headers are cleansed of _KERNEL_ pieces that we need + 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-hrtimer-getset-expires.c, -DSTAPCONF_HRTIMER_GETSET_EXPIRES,)" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-inode-private.c, -DSTAPCONF_INODE_PRIVATE,)" << endl; @@ -113,6 +120,7 @@ compile_pass (systemtap_session& s) o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-oneachcpu-retry.c, -DSTAPCONF_ONEACHCPU_RETRY,)" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-dpath-path.c, -DSTAPCONF_DPATH_PATH,)" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-synchronize-sched.c, -DSTAPCONF_SYNCHRONIZE_SCHED,)" << endl; + o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-task-uid.c, -DSTAPCONF_TASK_UID,)" << endl; #if 0 /* NB: For now, the performance hit of probe_kernel_read/write (vs. our |