From 8475a5876d3ecbbfd2a590ab6ea81e332dfb2773 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 20 Jan 2019 19:58:04 -0600 Subject: add _LP64 checks --- patches/bn_div.c.patch | 11 +++++++++++ patches/bn_lcl.h.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 patches/bn_div.c.patch create mode 100644 patches/bn_lcl.h.patch (limited to 'patches') diff --git a/patches/bn_div.c.patch b/patches/bn_div.c.patch new file mode 100644 index 0000000..9989e8d --- /dev/null +++ b/patches/bn_div.c.patch @@ -0,0 +1,11 @@ +--- openbsd/src/lib/libcrypto/bn/bn_div.c 2018-08-03 22:40:06.596555542 -0500 ++++ crypto/bn/bn_div.c 2019-01-20 19:26:37.891450640 -0600 +@@ -89,7 +89,7 @@ + q; \ + }) + # define REMAINDER_IS_ALREADY_CALCULATED +-# elif defined(__x86_64) ++# elif defined(__x86_64) && defined(_LP64) + /* + * Same story here, but it's 128-bit by 64-bit division. Wow! + * diff --git a/patches/bn_lcl.h.patch b/patches/bn_lcl.h.patch new file mode 100644 index 0000000..184bbd7 --- /dev/null +++ b/patches/bn_lcl.h.patch @@ -0,0 +1,11 @@ +--- ./openbsd/src/lib/libcrypto/bn/bn_lcl.h 2018-12-17 06:59:43.067523154 -0600 ++++ ./crypto/bn/bn_lcl.h 2019-01-20 19:43:53.679717457 -0600 +@@ -239,7 +239,7 @@ + : "r"(a), "r"(b)); \ + ret; }) + # endif /* compiler */ +-# elif defined(__x86_64) || defined(__x86_64__) ++# elif (defined(__x86_64) || defined(__x86_64__)) && defined(_LP64) + # if defined(__GNUC__) && __GNUC__>=2 + # define BN_UMULT_HIGH(a,b) ({ \ + BN_ULONG ret,discard; \ -- cgit v1.2.3-55-g6feb