mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-23 20:15:19 -07:00
Do not assume that __clang__ being defined implied __GNUC__ defined as well
This commit is contained in:
parent
b1273b0411
commit
1f1b0afb5c
@ -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)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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,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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user