Commit 34a9056f authored by Paul Bakker's avatar Paul Bakker
Browse files

- POLARSSL_HAVE_ASM also used in padlock and timing code.

parent 1d4f30ca
......@@ -16,6 +16,8 @@ PolarSSL ChangeLog
load_file()
* Made definition of net_htons() endian-clean for big endian
systems (Found by Gernot).
* Undefining POLARSSL_HAVE_ASM now also handles prevents asm in
padlock and timing code.
= Version 0.10.0 released on 2009-01-12
* Migrated XySSL to PolarSSL
......
......@@ -24,7 +24,7 @@
#include "polarssl/aes.h"
#if (defined(__GNUC__) && defined(__i386__))
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && defined(__i386__)
#ifndef POLARSSL_HAVE_X86
#define POLARSSL_HAVE_X86
......
......@@ -51,7 +51,8 @@ struct _hr_time
#endif
#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
#if defined(POLARSSL_HAVE_ASM) && \
(defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
unsigned long hardclock( void )
{
......@@ -62,7 +63,7 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && defined(__i386__)
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && defined(__i386__)
unsigned long hardclock( void )
{
......@@ -72,7 +73,8 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && \
(defined(__amd64__) || defined(__x86_64__))
unsigned long hardclock( void )
{
......@@ -82,7 +84,8 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && \
(defined(__powerpc__) || defined(__ppc__))
unsigned long hardclock( void )
{
......@@ -100,7 +103,7 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && defined(__sparc__)
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && defined(__sparc__)
unsigned long hardclock( void )
{
......@@ -111,7 +114,7 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && defined(__alpha__)
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && defined(__alpha__)
unsigned long hardclock( void )
{
......@@ -121,7 +124,7 @@ unsigned long hardclock( void )
}
#else
#if defined(__GNUC__) && defined(__ia64__)
#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) && defined(__ia64__)
unsigned long hardclock( void )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment