stapdyn: runtime build fixes following PR14364

* runtime/dyninst/linux_defs.h: Add noinline.
* runtime/dyninst/runtime.h: Nullify get_fs/set_fs machinery.

diff --git a/runtime/dyninst/linux_defs.h b/runtime/dyninst/linux_defs.h
index 0d0d41ff50f8af79a4382f06190a7bc232a8037b..9fd8a3981ef982090633f5a03e32130cbe9c9e51 100644 (file)
--- a/runtime/dyninst/linux_defs.h
+++ b/runtime/dyninst/linux_defs.h
@@ -49,6 +49,8 @@
 #define __must_be_array(arr) 0
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
 
+#define  noinline                      __attribute__((noinline))
+
 #define ATOMIC_INIT(i)  { (i) }
 
 static inline void atomic_inc(atomic_t *v)

diff --git a/runtime/dyninst/runtime.h b/runtime/dyninst/runtime.h
index ed2f00725c961ab70ca56774de3cb82ef20f5d9b..285a4212a25c70b6be18724db65685d0f9617bf6 100644 (file)
--- a/runtime/dyninst/runtime.h
+++ b/runtime/dyninst/runtime.h
@@ -41,6 +41,14 @@ typedef uint64_t u64;
 #include "linux_types.h"
 
 
+// segments don't matter in dyninst...
+#define USER_DS (1)
+#define KERNEL_DS (-1)
+typedef int mm_segment_t;
+static inline mm_segment_t get_fs(void) { return 0; }
+static inline void set_fs(mm_segment_t seg) { (void)seg; }
+
+
 static inline int atomic_add_return(int i, atomic_t *v)
 {
        return __sync_add_and_fetch(&(v->counter), i);