Include __GNUC_RH_RELEASE__ in the volatile check.

sdt.h (GNUC_VERSION) Include __GNUC_RH_RELEASE__.  Check for at least gcc 4.4.4

diff --git a/NEWS b/NEWS
index bd65b2a37ff5ab153cd660029a7dd282fe8583cd..26ae195bbd40d26129477ea1d30de5be1a12ee01 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 * What's new
 
-- User space marker arguments no longer use volatile if richer DWARF debuginfo
-  is available.
+- 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.
 
 - A new construct for error handling is available.  It is similar to c++
   exception catching, using try and catch as new keywords.  Within a handler

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 314f9cc1254de82ae257d5bcdd0816f552d98cdf..971b0c8b1c5d50963a0651ac80dc0cd0ec027cd8 100644 (file)
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -80,8 +80,11 @@
 
 #define STAP_UPROBE_GUARD 0x31425250
 
-#define GNUC_VERSION (__GNUC__ * 10000  + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GNUC_VERSION >= 40403
+#ifndef __GNUC_RH_RELEASE__
+#define __GNUC_RH_RELEASE__ 0
+#endif
+#define GNUC_VERSION (__GNUC__ * 1000000  + __GNUC_MINOR__ * 10000 + __GNUC_PATCHLEVEL__ * 100 + __GNUC_RH_RELEASE__)
+#if GNUC_VERSION >= 4040400 && ! defined VOLATILE
 #define VOLATILE_ARG
 #else
 #define VOLATILE_ARG volatile