wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1987 from dgarske/32bit

Browse Source 
Fixes for `--enable-32bit` option
This commit is contained in:
toddouska
2019-01-02 11:38:31 -08:00
committed by GitHub
parent 9c75753bd2 86177d1830
commit 5677e71cba
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -199,18 +199,15 @@ AM_CONDITIONAL([BUILD_ALL], [test "x$ENABLED_ALL" = "xyes"])
# Support for forcing 32-bit mode # Support for forcing 32-bit mode
# To force 32-bit instructions use:
# ./configure CFLAGS="-m32" LDFLAGS="-m32" && make
# The checks for sizeof long and long/long are run at the top of configure and require "-m32" to be set directly in the ./configure statement.
AC_ARG_ENABLE([32bit], AC_ARG_ENABLE([32bit],
[AS_HELP_STRING([--enable-32bit],[Enables 32-bit support (default: disabled)])], [AS_HELP_STRING([--enable-32bit],[Enables 32-bit support (default: disabled)])],
[ ENABLED_32BIT=$enableval ], [ ENABLED_32BIT=$enableval ],
[ ENABLED_32BIT=no ] [ ENABLED_32BIT=no ]
) )
if test "$ENABLED_32BIT" = "yes"
then
AM_CFLAGS="$AM_CFLAGS -DNO_64BIT -DNO_CURVED25519_128BIT -m32"
AM_LDFLAGS="$AM_LDFLAGS -m32"
fi
# Support for disabling all ASM # Support for disabling all ASM
AC_ARG_ENABLE([asm], AC_ARG_ENABLE([asm],
@@ -1505,7 +1502,7 @@ then
ENABLED_CURVE25519=yes ENABLED_CURVE25519=yes
fi fi
if test "$ENABLED_CURVE25519" = "no128bit" if test "$ENABLED_CURVE25519" = "no128bit" || test "$ENABLED_32BIT" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DNO_CURVED25519_128BIT" AM_CFLAGS="$AM_CFLAGS -DNO_CURVED25519_128BIT"
ENABLED_CURVE25519=yes ENABLED_CURVE25519=yes
@@ -2407,7 +2404,7 @@ then
ENABLED_POLY1305=no ENABLED_POLY1305=no
fi fi
if test "$ENABLED_POLY1305" = "yes" && test "$ENABLED_32BIT" = "no" if test "$ENABLED_POLY1305" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_POLY1305 -DHAVE_ONE_TIME_AUTH" AM_CFLAGS="$AM_CFLAGS -DHAVE_POLY1305 -DHAVE_ONE_TIME_AUTH"
fi fi