From 22ca9c0197c4a3c73a858d86bbedbd1843e18f4f Mon Sep 17 00:00:00 2001 From: "Barry K. Nathan" Date: Mon, 5 May 2014 23:26:13 -0700 Subject: [PATCH] Fix preprocessor checks for bn_mul PPC asm On OS X, neither __powerpc__ nor __ppc__ is defined on PPC64, so the asm code was only being used on PPC32. --- ChangeLog | 1 + include/polarssl/bn_mul.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a174aebc8..f51e77226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ Bugfix * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer) * Stricter check on SSL ClientHello internal sizes compared to actual packet size (found by TrustInSoft) + * Fix preprocessor checks for bn_mul PPC asm (found by Barry K. Nathan). = Version 1.2.10 released 2013-10-07 Changes diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h index 870be37d6..3b3147f40 100644 --- a/include/polarssl/bn_mul.h +++ b/include/polarssl/bn_mul.h @@ -285,7 +285,6 @@ #endif /* MC68000 */ -#if defined(__powerpc__) || defined(__ppc__) #if defined(__powerpc64__) || defined(__ppc64__) #if defined(__MACH__) && defined(__APPLE__) @@ -371,7 +370,7 @@ #endif -#else /* PPC32 */ +#elif defined(__powerpc__) || defined(__ppc__) /* end PPC64/begin PPC32 */ #if defined(__MACH__) && defined(__APPLE__) @@ -456,7 +455,6 @@ #endif #endif /* PPC32 */ -#endif /* PPC64 */ #if defined(__sparc__) && defined(__sparc64__)