From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- src/crypto/cpu-arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/crypto/cpu-arm.c') diff --git a/src/crypto/cpu-arm.c b/src/crypto/cpu-arm.c index 74e937b..6e037ab 100644 --- a/src/crypto/cpu-arm.c +++ b/src/crypto/cpu-arm.c @@ -24,7 +24,7 @@ #include #endif -#include "arm_arch.h" +#include /* We can't include because the Android SDK version against which @@ -70,12 +70,12 @@ static void sigill_handler(int signal) { siglongjmp(sigill_jmp, signal); } -void CRYPTO_arm_neon_probe(); +void CRYPTO_arm_neon_probe(void); // probe_for_NEON returns 1 if a NEON instruction runs successfully. Because // getauxval doesn't exist on Android until Jelly Bean, supporting NEON on // older devices requires this. -static int probe_for_NEON() { +static int probe_for_NEON(void) { int supported = 0; sigset_t sigmask; -- cgit v1.1 From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- src/crypto/cpu-arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/crypto/cpu-arm.c') diff --git a/src/crypto/cpu-arm.c b/src/crypto/cpu-arm.c index 6e037ab..74e937b 100644 --- a/src/crypto/cpu-arm.c +++ b/src/crypto/cpu-arm.c @@ -24,7 +24,7 @@ #include #endif -#include +#include "arm_arch.h" /* We can't include because the Android SDK version against which @@ -70,12 +70,12 @@ static void sigill_handler(int signal) { siglongjmp(sigill_jmp, signal); } -void CRYPTO_arm_neon_probe(void); +void CRYPTO_arm_neon_probe(); // probe_for_NEON returns 1 if a NEON instruction runs successfully. Because // getauxval doesn't exist on Android until Jelly Bean, supporting NEON on // older devices requires this. -static int probe_for_NEON(void) { +static int probe_for_NEON() { int supported = 0; sigset_t sigmask; -- cgit v1.1 From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- src/crypto/cpu-arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/crypto/cpu-arm.c') diff --git a/src/crypto/cpu-arm.c b/src/crypto/cpu-arm.c index 74e937b..6e037ab 100644 --- a/src/crypto/cpu-arm.c +++ b/src/crypto/cpu-arm.c @@ -24,7 +24,7 @@ #include #endif -#include "arm_arch.h" +#include /* We can't include because the Android SDK version against which @@ -70,12 +70,12 @@ static void sigill_handler(int signal) { siglongjmp(sigill_jmp, signal); } -void CRYPTO_arm_neon_probe(); +void CRYPTO_arm_neon_probe(void); // probe_for_NEON returns 1 if a NEON instruction runs successfully. Because // getauxval doesn't exist on Android until Jelly Bean, supporting NEON on // older devices requires this. -static int probe_for_NEON() { +static int probe_for_NEON(void) { int supported = 0; sigset_t sigmask; -- cgit v1.1