summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml1
-rwxr-xr-xTestScripts/install-android.sh3
-rwxr-xr-xTestScripts/setenv-travis.sh22
-rw-r--r--ppc_simd.h24
4 files changed, 15 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a8704f6..11e161c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -537,7 +537,6 @@ before_install:
# https://github.com/travis-ci/travis-ci/issues/9037
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
sudo apt-get update
- source TestScripts/setenv-travis.sh
bash TestScripts/install-android.sh
fi
if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "autotools" ]]; then
diff --git a/TestScripts/install-android.sh b/TestScripts/install-android.sh
index 3bf5b3df..686b3fe6 100755
--- a/TestScripts/install-android.sh
+++ b/TestScripts/install-android.sh
@@ -42,6 +42,9 @@ fi
rm -f /tmp/android-sdk.zip
rm -f /tmp/android-ndk.zip
+# https://stackoverflow.com/a/47028911/608639
+touch "$ANDROID_HOME/repositories.cfg"
+
echo "Finished preparing SDK and NDK"
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
diff --git a/TestScripts/setenv-travis.sh b/TestScripts/setenv-travis.sh
deleted file mode 100755
index 10f4f964..00000000
--- a/TestScripts/setenv-travis.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#/usr/bin/env bash
-
-# This file should be source'd when required.
-
-echo "Setting Travis environment"
-
-export ANDROID_HOME="$HOME/android-sdk/"
-export ANDROID_SDK="$HOME/android-sdk/"
-export ANDROID_NDK="$HOME/android-ndk/"
-export ANDROID_SDK_ROOT="$ANDROID_SDK"
-export ANDROID_NDK_ROOT="$ANDROID_NDK"
-
-mkdir -p "$ANDROID_HOME"
-mkdir -p "$ANDROID_SDK_ROOT"
-mkdir -p "$ANDROID_NDK_ROOT"
-
-# https://stackoverflow.com/a/47028911/608639
-touch "$ANDROID_HOME/repositories.cfg"
-
-echo "Finished setting environment"
-
-[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
diff --git a/ppc_simd.h b/ppc_simd.h
index 20633dab..6edef07d 100644
--- a/ppc_simd.h
+++ b/ppc_simd.h
@@ -103,8 +103,8 @@
// Clang did not add vec_xl for little endian until November 2016
// via https://reviews.llvm.org/D26519 . The release coincides
-// with roughly Clang 4.0 released March 2017. There is a
-// Clang 3.9.1 release, but it is not clear of vec_xl made it.
+// with roughly Clang 4.0 released March 2017. There is an earlier
+// Clang 3.9.1 release, but it is not clear if vec_xl made it.
#if defined(__clang__) && (__clang_major__ >= 4)
# define later_clang 1
#endif
@@ -263,7 +263,7 @@ inline uint32x4_p VecLoad(const byte src[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
return (uint32x4_p)vec_xlw4(0, (byte*)src);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl(0, (byte*)src);
# else
return (uint32x4_p)vec_vsx_ld(0, (byte*)src);
@@ -291,7 +291,7 @@ inline uint32x4_p VecLoad(int off, const byte src[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
return (uint32x4_p)vec_xlw4(off, (byte*)src);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl(off, (byte*)src);
# else
return (uint32x4_p)vec_vsx_ld(off, (byte*)src);
@@ -393,7 +393,7 @@ inline uint32x4_p VecLoadAligned(const byte src[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
return (uint32x4_p)vec_xlw4(0, (byte*)src);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl(0, (byte*)src);
# else
return (uint32x4_p)vec_vsx_ld(0, (byte*)src);
@@ -421,7 +421,7 @@ inline uint32x4_p VecLoadAligned(int off, const byte src[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
return (uint32x4_p)vec_xlw4(off, (byte*)src);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl(off, (byte*)src);
# else
return (uint32x4_p)vec_vsx_ld(off, (byte*)src);
@@ -454,7 +454,7 @@ inline uint32x4_p VecLoadBE(const byte src[16])
# else
return (uint32x4_p)VecReverse(vec_xlw4(0, (byte*)src));
# endif
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl_be(0, (byte*)src);
# else
# if (CRYPTOPP_BIG_ENDIAN)
@@ -495,7 +495,7 @@ inline uint32x4_p VecLoadBE(int off, const byte src[16])
# else
return (uint32x4_p)VecReverse(vec_xlw4(off, (byte*)src));
# endif
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
return (uint32x4_p)vec_xl_be(off, (byte*)src);
# else
# if (CRYPTOPP_BIG_ENDIAN)
@@ -615,7 +615,7 @@ inline void VecStore(const T data, byte dest[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
vec_xstw4((uint8x16_p)data, 0, (byte*)dest);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
vec_xst((uint8x16_p)data, 0, (byte*)dest);
# else
vec_vsx_st((uint8x16_p)data, 0, (byte*)dest);
@@ -646,7 +646,7 @@ inline void VecStore(const T data, int off, byte dest[16])
#if defined(_ARCH_PWR8)
# if defined(early_xlc) || defined(early_xlC)
vec_xstw4((uint8x16_p)data, off, (byte*)dest);
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
vec_xst((uint8x16_p)data, off, (byte*)dest);
# else
vec_vsx_st((uint8x16_p)data, off, (byte*)dest);
@@ -765,7 +765,7 @@ inline void VecStoreBE(const T data, byte dest[16])
# else
vec_xstw4((uint8x16_p)VecReverse(data), 0, (byte*)dest);
# endif
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
vec_xst_be((uint8x16_p)data, 0, (byte*)dest);
# else
# if (CRYPTOPP_BIG_ENDIAN)
@@ -809,7 +809,7 @@ inline void VecStoreBE(const T data, int off, byte dest[16])
# else
vec_xstw4((uint8x16_p)VecReverse(data), off, (byte*)dest);
# endif
-# elif defined(__xlc__) || defined(__xlC__) || defined(later_clang)
+# elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
vec_xst_be((uint8x16_p)data, off, (byte*)dest);
# else
# if (CRYPTOPP_BIG_ENDIAN)
View Lorry Controller Status