From 3094cc1dbde257d9b92e213089707cac8544db60 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 10 Aug 2012 12:15:29 +0200 Subject: [PATCH] Teach Botan about the Intel compiler Change-Id: I44cf52568e0fdbde6935c6844874b39a37941c33 Reviewed-by: Christian Kandeler --- src/libs/3rdparty/botan/botan.cpp | 2 +- src/libs/3rdparty/botan/botan.pro | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp index 3642826788c..c1eb2cf9c36 100644 --- a/src/libs/3rdparty/botan/botan.cpp +++ b/src/libs/3rdparty/botan/botan.cpp @@ -46239,7 +46239,7 @@ namespace { } #elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \ - (defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC)) + (defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_INTEL)) /* * We can't safely use this on x86-32 as some 32-bit ABIs use ebx as diff --git a/src/libs/3rdparty/botan/botan.pro b/src/libs/3rdparty/botan/botan.pro index d11bfd0aa40..7ae5df14d53 100644 --- a/src/libs/3rdparty/botan/botan.pro +++ b/src/libs/3rdparty/botan/botan.pro @@ -22,6 +22,7 @@ unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN *g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC *clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG +*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL win32 { DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \