You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/04/09 17:57:36 UTC
trafficserver git commit: TS-3514: GCC compiler >= 4.1 should accept
5.x as well
Repository: trafficserver
Updated Branches:
refs/heads/master 1122b611f -> 5d67f2302
TS-3514: GCC compiler >= 4.1 should accept 5.x as well
Signed-off-by: Marcin Juszkiewicz <mj...@redhat.com>
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5d67f230
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5d67f230
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5d67f230
Branch: refs/heads/master
Commit: 5d67f230220765a18da9392a10239d94e7c5d94a
Parents: 1122b61
Author: Marcin Juszkiewicz <mj...@redhat.com>
Authored: Thu Apr 9 13:24:40 2015 +0200
Committer: James Peach <jp...@apache.org>
Committed: Thu Apr 9 08:56:58 2015 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
lib/ts/ink_atomic.h | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5d67f230/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ef37eed..a04d8d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3514] Atomic check for gcc >4.1 breaks with gcc 5.0
+ Author: Marcin Juszkiewicz <mj...@redhat.com>
+
*) [TS-3507] Add stats for the milestones
*) [TS-3480] Large stream id cause PROTOCOL_ERROR.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5d67f230/lib/ts/ink_atomic.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index 84fc470..8d6037b 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -63,7 +63,8 @@ typedef vlong *pvlong;
typedef vvoidp *pvvoidp;
/* GCC compiler >= 4.1 */
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 1)
+#if defined(__GNUC__) && ( ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 5) )
+
/* see http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html */