cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not assume that __clang__ being defined implied __GNUC__ defined as well

Browse Source
This commit is contained in:
Frank Denis 2017-12-19 21:41:56 +01:00
parent b1273b0411
commit 1f1b0afb5c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -635,7 +635,7 @@ AC_SUBST(HAVE_AVX_ASM_V)
AC_MSG_CHECKING(for 128-bit arithmetic) AC_MSG_CHECKING(for 128-bit arithmetic)
HAVE_TI_MODE_V=0 HAVE_TI_MODE_V=0
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if !defined(__GNUC__) && !defined(__SIZEOF_INT128__) #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__)
# error mode(TI) is a gcc extension, and __int128 is not available # error mode(TI) is a gcc extension, and __int128 is not available
#endif #endif
#if defined(__clang__) && !defined(__x86_64__) && !defined(__ARM_NEON) #if defined(__clang__) && !defined(__x86_64__) && !defined(__ARM_NEON)

2
src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h
View File

@ -5,7 +5,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
# define POLY1305_NOINLINE __declspec(noinline) # define POLY1305_NOINLINE __declspec(noinline)
#elif defined(__GNUC__) #elif defined(__clang__) || defined(__GNUC__)
# define POLY1305_NOINLINE __attribute__((noinline)) # define POLY1305_NOINLINE __attribute__((noinline))
#else #else
# define POLY1305_NOINLINE # define POLY1305_NOINLINE

2
src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h
View File

@ -13,7 +13,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
# define POLY1305_NOINLINE __declspec(noinline) # define POLY1305_NOINLINE __declspec(noinline)
#elif defined(__GNUC__) #elif defined(__clang__) || defined(__GNUC__)
# define POLY1305_NOINLINE __attribute__((noinline)) # define POLY1305_NOINLINE __attribute__((noinline))
#else #else
# define POLY1305_NOINLINE # define POLY1305_NOINLINE

2
src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
View File

@ -21,7 +21,7 @@ typedef __m128i xmmi;
# if defined(_MSC_VER) # if defined(_MSC_VER)
# define POLY1305_NOINLINE __declspec(noinline) # define POLY1305_NOINLINE __declspec(noinline)
# elif defined(__GNUC__) # elif defined(__clang__) || defined(__GNUC__)
# define POLY1305_NOINLINE __attribute__((noinline)) # define POLY1305_NOINLINE __attribute__((noinline))
# else # else
# define POLY1305_NOINLINE # define POLY1305_NOINLINE

2
src/libsodium/include/sodium/export.h
View File

@ -2,7 +2,7 @@
#ifndef sodium_export_H #ifndef sodium_export_H
#define sodium_export_H #define sodium_export_H
#ifndef __GNUC__ #if !defined(__clang__) && !defined(__GNUC__)
# ifdef __attribute__ # ifdef __attribute__
# undef __attribute__ # undef __attribute__
# endif # endif

2
src/libsodium/include/sodium/private/common.h
View File

@ -196,7 +196,7 @@ xor_buf(unsigned char *out, const unsigned char *in, size_t n)
} }
} }
#ifndef __GNUC__ #if !defined(__clang__) && !defined(__GNUC__)
# ifdef __attribute__ # ifdef __attribute__
# undef __attribute__ # undef __attribute__
# endif # endif

2
src/libsodium/sodium/utils.c
View File

@ -25,7 +25,7 @@
# ifdef HAVE_ALLOCA_H # ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
# elif !defined(alloca) # elif !defined(alloca)
# if defined(__GNUC__) # if defined(__clang__) || defined(__GNUC__)
# define alloca __builtin_alloca # define alloca __builtin_alloca
# elif defined _AIX # elif defined _AIX
# define alloca __alloca # define alloca __alloca