You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/08/07 18:30:16 UTC
git commit: TS-2860: Add AArch64 support
Repository: trafficserver
Updated Branches:
refs/heads/master e3f957ef2 -> 2167d9386
TS-2860: Add AArch64 support
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2167d938
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2167d938
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2167d938
Branch: refs/heads/master
Commit: 2167d93869f157e02d31f27cf37c86545a82007d
Parents: e3f957e
Author: Marcin Juszkiewicz <mj...@redhat.com>
Authored: Thu Aug 7 10:23:22 2014 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Thu Aug 7 10:23:22 2014 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/ink_queue.h | 2 +-
plugins/header_rewrite/lulu.h | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2167d938/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8921059..d8dd8bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.1.0
+ *) [TS-2860] Add AArch64 support.
+
*) [TS-2916] set response header properly for combo_handler plugin.
*) [TS-2883] Core dump in TSFetchCreate()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2167d938/lib/ts/ink_queue.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index 9c35853..ec64603 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -134,7 +134,7 @@ extern "C"
#define FREELIST_VERSION(_x) (_x).s.version
#define SET_FREELIST_POINTER_VERSION(_x,_p,_v) \
(_x).s.pointer = _p; (_x).s.version = _v
-#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__)
+#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__aarch64__)
#define FREELIST_POINTER(_x) ((void*)(((((intptr_t)(_x).data)<<16)>>16) | \
(((~((((intptr_t)(_x).data)<<16>>63)-1))>>48)<<48))) // sign extend
#define FREELIST_VERSION(_x) (((intptr_t)(_x).data)>>48)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2167d938/plugins/header_rewrite/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h
index 5ba7441..2652953 100644
--- a/plugins/header_rewrite/lulu.h
+++ b/plugins/header_rewrite/lulu.h
@@ -57,6 +57,10 @@ char* getIP(sockaddr const* s_sockaddr, char res[INET6_ADDRSTRLEN]);
#define mb() __asm__ __volatile__ ("sync" : : : "memory")
#define rmb() __asm__ __volatile__ ("sync" : : : "memory")
#define wmb() __asm__ __volatile__ ("sync" : : : "memory")
+#elif defined(__aarch64__)
+#define mb() __asm__ __volatile__ ( "dsb sy" : : : "memory")
+#define rmb() __asm__ __volatile__ ( "dsb ld" : : : "memory")
+#define wmb() __asm__ __volatile__ ( "dsb st" : : : "memory")
#else
#error "Define barriers"
#endif