Navigation Menu

Skip to content

Instantly share code, notes, and snippets.

@directhex
Created April 9, 2018 20:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save directhex/94767e1c2ff607715ec2581ba3219583 to your computer and use it in GitHub Desktop.
Save directhex/94767e1c2ff607715ec2581ba3219583 to your computer and use it in GitHub Desktop.
--- /home/directhex/Projects/mono/external/boringssl/crypto/sha/asm/sha512-armv4.pl 2016-11-10 09:06:52.505845000 -0500
+++ crypto/fipsmodule/sha/asm/sha512-armv4.pl 2018-04-09 13:37:28.119648976 -0400
@@ -201,6 +208,10 @@
# define VFP_ABI_POP
#endif
+@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
+.arch armv7-a
+
#ifdef __ARMEL__
# define LO 0
# define HI 4
@@ -212,16 +223,12 @@
#endif
.text
-#if __ARM_ARCH__<7 || defined(__APPLE__)
-.code 32
-#else
+#if defined(__thumb2__)
.syntax unified
-# ifdef __thumb2__
-# define adrl adr
.thumb
-# else
-.code 32
-# endif
+# define adrl adr
+#else
+.code 32
#endif
.type K512,%object
@@ -280,10 +287,10 @@
.type sha512_block_data_order,%function
sha512_block_data_order:
.Lsha512_block_data_order:
-#if __ARM_ARCH__<7
+#if __ARM_ARCH__<7 && !defined(__thumb2__)
sub r3,pc,#8 @ sha512_block_data_order
#else
- adr r3,sha512_block_data_order
+ adr r3,.Lsha512_block_data_order
#endif
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
ldr r12,.LOPENSSL_armcap
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment