Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 15 insertions, 0 deletions

diff --git a/testsuite/systemtap.base/uprobes_lib.stp b/testsuite/systemtap.base/uprobes_lib.stp
new file mode 100644
index 00000000..459351a4
--- /dev/null
+++ b/testsuite/systemtap.base/uprobes_lib.stp
@@ -0,0 +1,15 @@
+probe process("uprobes_exe").function("main") {
+  printf("main\n");
+}
+
+probe process("uprobes_exe").function("main_func") {
+  printf("main_func\n");
+}
+
+probe process("libuprobes_lib.so").function("lib_main") {
+  printf("lib_main\n");
+}
+
+probe process("libuprobes_lib.so").function("lib_func") {
+  printf("lib_func\n");
+}