Be pessimistic about the gcc version as debuginfo has an undependable case (RH572260).

* sdt.h (GNUC_VERSION): Check against gcc 4.5.0

diff --git a/NEWS b/NEWS
index e9ded314f5a1c47454f171aae8a42b036e41c645..df0824d3c56ee358d9124067ccd709d6672e9f99 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
   ordinary system functions.
 
 - User space marker arguments no longer use volatile if the version of gcc,
-  which must be at least 4.4.4, supports richer DWARF debuginfo.  Use cflags
+  which must be at least 4.5.0, supports richer DWARF debuginfo.  Use cflags
   -DSTAP_SDT_VOLATILE=volatile or -DSTAP_SDT_VOLATILE= when building
   the sys/sdt.h application to override this one way or another.
 

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index ed4b4af64ee31c833723cf92810bc5e1657d5427..6ef961f25147603009552cdd140fa6737bb0315c 100644 (file)
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -86,7 +86,7 @@
 
 #ifndef STAP_SDT_VOLATILE /* allow users to override */
 #define GNUC_VERSION (__GNUC__ * 1000000  + __GNUC_MINOR__ * 10000 + __GNUC_PATCHLEVEL__ * 100 + __GNUC_RH_RELEASE__)
-#if GNUC_VERSION >= 4040400
+#if GNUC_VERSION >= 4050000
 #define STAP_SDT_VOLATILE
 #else
 #define STAP_SDT_VOLATILE volatile