diff options
| author | Mark Wielaard <mjw@redhat.com> | 2010-03-17 15:41:02 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2010-03-17 15:41:02 +0100 |
| commit | 6ccb243c59eff3ac89072b112414c50d6ef6cf3b (patch) | |
| tree | f32d1ad710f6538888d05fc097d92721462611c9 /includes/sys | |
| parent | d7c88bfad6ef6188fcbd888bd1235486aa31a5e6 (diff) | |
| download | systemtap-steved-6ccb243c59eff3ac89072b112414c50d6ef6cf3b.tar.gz systemtap-steved-6ccb243c59eff3ac89072b112414c50d6ef6cf3b.tar.xz systemtap-steved-6ccb243c59eff3ac89072b112414c50d6ef6cf3b.zip | |
PR11364 sdt.h volatile for args isn't needed with gcc 4.5 or rh 4.4.3-10+
Diffstat (limited to 'includes/sys')
| -rw-r--r-- | includes/sys/sdt.h | 10 |
1 files changed, 4 insertions, 6 deletions
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 |