diff -Nru trafficserver-5.3.0/debian/changelog trafficserver-5.3.0/debian/changelog --- trafficserver-5.3.0/debian/changelog 2015-06-12 15:03:29.000000000 +0000 +++ trafficserver-5.3.0/debian/changelog 2015-06-25 07:29:56.000000000 +0000 @@ -1,3 +1,10 @@ +trafficserver (5.3.0-2+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 5.0.1-1+rpi1 by Peter Michael Green at Sun, 29 Mar 2015 02:31:47 +0000] + * Add armv6 asm for memory barriers. + + -- Peter Michael Green Thu, 25 Jun 2015 02:17:28 +0000 + trafficserver (5.3.0-2) unstable; urgency=medium * Avoid installing tslua.so on archs built without LuaJIT diff -Nru trafficserver-5.3.0/debian/patches/series trafficserver-5.3.0/debian/patches/series --- trafficserver-5.3.0/debian/patches/series 2015-06-11 01:52:37.000000000 +0000 +++ trafficserver-5.3.0/debian/patches/series 2015-06-25 07:21:08.000000000 +0000 @@ -1 +1,2 @@ fix_TS-3632.patch +support-armv6.patch diff -Nru trafficserver-5.3.0/debian/patches/support-armv6.patch trafficserver-5.3.0/debian/patches/support-armv6.patch --- trafficserver-5.3.0/debian/patches/support-armv6.patch 1970-01-01 00:00:00.000000000 +0000 +++ trafficserver-5.3.0/debian/patches/support-armv6.patch 2015-06-25 07:27:14.000000000 +0000 @@ -0,0 +1,33 @@ +Description: Add armv6 asm for memory barriers. + armv6 doesn't have dmb but it does have a coprocessor instruction that + provides the same function. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: trafficserver-5.3.0/plugins/header_rewrite/lulu.h +=================================================================== +--- trafficserver-5.3.0.orig/plugins/header_rewrite/lulu.h ++++ trafficserver-5.3.0/plugins/header_rewrite/lulu.h +@@ -45,6 +45,10 @@ uint16_t getPort(sockaddr const *s_socka + #define mb() __asm__ __volatile__("sync" : : : "memory") + #define rmb() __asm__ __volatile__("sync" : : : "memory") + #define wmb() __asm__ __volatile__("" : : : "memory") ++#elif defined(__ARM_ARCH_6__) ++#define mb() __asm__ __volatile__("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define rmb() __asm__ __volatile__("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define wmb() __asm__ __volatile__("" : : : "memory") + #elif defined(__arm__) + #define mb() __asm__ __volatile__("dmb" : : : "memory") + #define rmb() __asm__ __volatile__("dmb" : : : "memory")