From ecf194547a1efcc82a6f77862a25c9327f55d011 Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Thu, 13 Mar 2008 16:16:18 +0000
Subject: 2008-03-13  Frank Ch. Eigler  <fche@elastic.org>

	PR 5928.
	* buildrun.cxx (compile_pass): Use EXTRA_CFLAGS for autoconf'd values
	instead of CFLAGS_<module>.o.
---
 buildrun.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'buildrun.cxx')

diff --git a/buildrun.cxx b/buildrun.cxx
index f3f29d49..8504cf62 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -74,16 +74,18 @@ compile_pass (systemtap_session& s)
   // Create makefile
 
   // Clever hacks copied from vmware modules
-  o << "stap_check_gcc = $(shell 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 if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
+  string superverbose;
+  if (s.verbose > 3)
+    superverbose = "set -x;";
 
+  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) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
 
   o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;
 
   // "autoconf" options go here
 
-  // enum hrtimer_mode renaming near 2.6.21; see tapsets.cxx hrtimer_derived_probe_group::emit_module_decls
-  string module_cflags = "CFLAGS_" + s.module_name + ".o";
+  string module_cflags = "EXTRA_CFLAGS";
   o << module_cflags << " :=" << 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;
-- 
cgit 


From 42cb22bd8d3108863152cd2a26e787f508cfae6b Mon Sep 17 00:00:00 2001
From: hiramatu <hiramatu>
Date: Sat, 15 Mar 2008 00:02:00 +0000
Subject: 2008-03-14  Masami Hiramatsu <mhiramat@redhat.com>

	PR 3542
	* buildrun.cxx (compile_pass): Add an autoconf to check the kernel
	supports batch unregistration.
	* tapsets.cxx (dwarf_derived_probe_group::emit_module_decls): Add an
	array of probe pointers for batch unregistration.
	* tapsets.cxx (dwarf_derived_probe_group::emit_module_exit): Use
	unregister_k(ret)probes if it is supported.
	* runtime/autoconf-unregister-kprobes.c : New file.
---
 buildrun.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'buildrun.cxx')

diff --git a/buildrun.cxx b/buildrun.cxx
index 8504cf62..f3e72272 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -95,6 +95,7 @@ compile_pass (systemtap_session& s)
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-x86-uniregs.c, -DSTAPCONF_X86_UNIREGS,)" << endl;
 
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-nameidata.c, -DSTAPCONF_NAMEIDATA_CLEANUP,)" << endl;
+  o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-unregister-kprobes.c, -DSTAPCONF_UNREGISTER_KPROBES,)" << endl;
 
   for (unsigned i=0; i<s.macros.size(); i++)
     o << "EXTRA_CFLAGS += -D " << lex_cast_qstring(s.macros[i]) << endl;
-- 
cgit