From 5b640028cba758355000632840b48165ad39957a Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Fri, 7 May 1999 15:42:23 +0000 Subject: [PATCH] Make -pedantic work again. --- CHANGES | 4 ++++ Configure | 2 +- crypto/sha/sha_locl.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 05cd935b71..535d56d072 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,10 @@ Changes between 0.9.2b and 0.9.3 + *) Add PEDANTIC compiler flag to allow compilation with gcc -pedantic, + without disallowing inline assembler and the like for non-pedantic builds. + [Ben Laurie] + *) Support Borland C++ builder. [Janez Jere , modified by Ulf Möller] diff --git a/Configure b/Configure index b2860befdb..7636cb9960 100755 --- a/Configure +++ b/Configure @@ -93,7 +93,7 @@ my %table=( # Our development configs "purify", "purify gcc:-g -DPURIFY -Wall:(unknown):-lsocket -lnsl::::", "debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:(unknown):-lefence::::", -"debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::", +"debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DPEDANTIC -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::", "debug-ben-debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::", "debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:(unknown):::::", "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h index 32bbe30afd..03215c2910 100644 --- a/crypto/sha/sha_locl.h +++ b/crypto/sha/sha_locl.h @@ -168,7 +168,7 @@ #define ROTATE(a,n) _lrotl(a,n) #elif defined(__GNUC__) /* some inline assembler templates by */ -#if defined(__i386) +#if defined(__i386) && !defined(PEDANTIC) #define ROTATE(a,n) ({ register unsigned int ret; \ asm ("roll %1,%0" \ : "=r"(ret) \ -- 2.25.1