portable asm generator patches for portable

This reverses changes from the 3.8.x upstream that are causing issues on
a few different platforms, including macOS x64, Windows, and older
Linux/FreeBSD.

1 files changed, 7 insertions, 2 deletions

diff --git a/update.sh b/update.sh
index 4c97ae3..93e71bb 100755
--- a/update.sh
+++ b/update.sh
@@ -191,12 +191,17 @@ fixup_masm() {
                 | sed -e 's/|/OR/g'   \
                 | sed -e 's/~/NOT/g'  \
                 | sed -e 's/1 << \([0-9]*\)/1 SHL \1/g' \
-                | sed -e 's/^ALIGN.*//g' \
                 > $2
 }
 
 # generate assembly crypto algorithms
-asm_src=$libcrypto_src
+asm_src=$CWD/asm
+rm -fr $asm_src
+cp -a $libcrypto_src $asm_src
+for i in `ls -1 patches/asm/*.patch | sort -n`; do
+        patch -d $asm_src -p 4 < $i;
+done
+
 gen_asm_stdout() {
         CC=true perl $asm_src/$2 $1 > crypto/$3.tmp
         [ $1 = "elf" ] && cat <<-EOF >> crypto/$3.tmp