  lib/accelerated/x86/elf/sha256-ssse3-x86.s       |   8 +-
  lib/accelerated/x86/elf/sha512-ssse3-x86.s       |   8 +-
  lib/accelerated/x86/elf/sha512-ssse3-x86_64.s    |  14 +-
- lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s   |   2 +-
- lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s |   2 +-
+ lib/accelerated/x86/macosx/aesni-x86.s           | 152 +++++++++---------
+ lib/accelerated/x86/macosx/aesni-x86_64.s        | 124 +++++++--------
+ lib/accelerated/x86/macosx/sha1-ssse3-x86.s      |   6 +-
+ lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s   |   6 +-
+ lib/accelerated/x86/macosx/sha256-ssse3-x86.s    |   6 +-
+ lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s |   6 +-
  lib/accelerated/x86/sha-x86-ssse3.c              |  12 +-
- 26 files changed, 316 insertions(+), 316 deletions(-)
+ 30 files changed, 464 insertions(+), 464 deletions(-)
 
 diff --git a/lib/accelerated/aarch64/elf/sha1-armv8.s b/lib/accelerated/aarch64/elf/sha1-armv8.s
 index 0dc68fe..d24ac5c 100644

From 693567fbc472d157f29b0f5b90eb6831f4ae4986 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Tue, 27 Mar 2018 19:10:26 +1100
Subject: [PATCH] asm: rename some assembly functions to not conflict with

 		for (i=0;i<t2;i++)
 			MD_INCR(ctx);
-- 
2.14.3 (Apple Git-98)

