From 6ccb243c59eff3ac89072b112414c50d6ef6cf3b Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 17 Mar 2010 15:41:02 +0100
Subject: PR11364 sdt.h volatile for args isn't needed with gcc 4.5 or rh
 4.4.3-10+

---
 includes/sys/sdt.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'includes/sys/sdt.h')

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 6ef961f2..7aa5874c 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -80,13 +80,11 @@
 
 #define STAP_UPROBE_GUARD 0x31425250
 
-#ifndef __GNUC_RH_RELEASE__
-#define __GNUC_RH_RELEASE__ 0
-#endif
-
 #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 >= 4050000
+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 5 \
+     || (defined __GNUC_RH_RELEASE__ \
+         && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 3 \
+         && (__GNUC_PATCHLEVEL__ > 3 || __GNUC_RH_RELEASE__ >= 10)))
 #define STAP_SDT_VOLATILE
 #else
 #define STAP_SDT_VOLATILE volatile
-- 
cgit