Comment 6 for bug 1130626

Revision history for this message
Timo Juhani Lindfors (timo-lindfors) wrote :

If I compare the binary packages systemtap-sdt-dev_1.7-1_amd64.deb and systemtap-sdt-dev_2.1-1~experimental1_amd64.deb I see that the changes are minimal:

diff -Nur ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/bin/dtrace ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/bin/dtrace
--- ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/bin/dtrace 2012-03-14 14:54:16.000000000 +0200
+++ ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/bin/dtrace 2013-03-07 18:35:49.000000000 +0200
@@ -267,7 +267,9 @@

         (d,fn) = mkstemp(suffix=".c")
         f = open(fn,mode='w')
- f.write("static __dtrace () {}\n")
+ # dummy declaration just to make the object file non-empty
+ f.write("static void __dtrace (void) __attribute__((unused));\n")
+ f.write("static void __dtrace (void) {}\n")
         f.write("\n#include <sys/sdt.h>\n\n")
         providers.semaphore_def_write(f)
         f.close()
diff -Nur ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/include/sys/sdt.h ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/include/sys/sdt.h
--- ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/include/sys/sdt.h 2012-03-14 14:54:18.000000000 +0200
+++ ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/include/sys/sdt.h 2013-03-07 18:35:51.000000000 +0200
@@ -130,7 +130,7 @@
   (!__extension__ \
    (__builtin_constant_p ((((unsigned long long) \
        (_SDT_ARGINTTYPE (x)) __sdt_unsp) \
- & (1ULL << (sizeof (unsigned long long) \
+ & ((unsigned long long)1 << (sizeof (unsigned long long) \
            * __CHAR_BIT__ - 1))) == 0) \
     || (_SDT_ARGINTTYPE (x)) -1 > (_SDT_ARGINTTYPE (x)) 0))
 # define _SDT_ARGSIZE(x) \