OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix the bootstrap of CompilerRT with host compilers that don't support 

emulating 128-bit arithmetic on 32-bit x86 targets. This should get the
bootstrap back for GCC 4.6 at least.

Suggestions on better ways to do the detection here are welcome...

llvm-svn: 165863
This commit is contained in:
Chandler Carruth 2012-10-13 02:30:10 +00:00
parent f402f78eb7
commit eea8a48218
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/ubsan/ubsan_diag.cc
View File

@ -36,7 +36,7 @@ Diag &Diag::operator<<(const Value &V) {
/// Hexadecimal printing for numbers too large for fprintf to handle directly. /// Hexadecimal printing for numbers too large for fprintf to handle directly.
static void PrintHex(UIntMax Val) { static void PrintHex(UIntMax Val) {
#ifdef HAVE_INT128_T #if HAVE_INT128_T
fprintf(stderr, "0x%08x%08x%08x%08x", fprintf(stderr, "0x%08x%08x%08x%08x",
(unsigned int)(Val >> 96), (unsigned int)(Val >> 96),
(unsigned int)(Val >> 64), (unsigned int)(Val >> 64),

4
compiler-rt/lib/ubsan/ubsan_value.cc
View File

@ -27,7 +27,7 @@ SIntMax Value::getSIntValue() const {
} }
if (getType().getIntegerBitWidth() == 64) if (getType().getIntegerBitWidth() == 64)
return *reinterpret_cast<s64*>(Val); return *reinterpret_cast<s64*>(Val);
#ifdef HAVE_INT128_T #if HAVE_INT128_T
if (getType().getIntegerBitWidth() == 128) if (getType().getIntegerBitWidth() == 128)
return *reinterpret_cast<s128*>(Val); return *reinterpret_cast<s128*>(Val);
#endif #endif
@ -40,7 +40,7 @@ UIntMax Value::getUIntValue() const {
return Val; return Val;
if (getType().getIntegerBitWidth() == 64) if (getType().getIntegerBitWidth() == 64)
return *reinterpret_cast<u64*>(Val); return *reinterpret_cast<u64*>(Val);
#ifdef HAVE_INT128_T #if HAVE_INT128_T
if (getType().getIntegerBitWidth() == 128) if (getType().getIntegerBitWidth() == 128)
return *reinterpret_cast<u128*>(Val); return *reinterpret_cast<u128*>(Val);
#endif #endif

6
compiler-rt/lib/ubsan/ubsan_value.h
View File

@ -23,15 +23,19 @@
#include "sanitizer_common/sanitizer_common.h" #include "sanitizer_common/sanitizer_common.h"
// FIXME: Move this out to a config header. // FIXME: Move this out to a config header.
#if defined(__clang__) || _LP64
typedef __int128 s128; typedef __int128 s128;
typedef unsigned __int128 u128; typedef unsigned __int128 u128;
#define HAVE_INT128_T 1 #define HAVE_INT128_T 1
#else
#define HAVE_INT128_T 0
#endif
namespace __ubsan { namespace __ubsan {
/// \brief Largest integer types we support. /// \brief Largest integer types we support.
#ifdef HAVE_INT128_T #if HAVE_INT128_T
typedef s128 SIntMax; typedef s128 SIntMax;
typedef u128 UIntMax; typedef u128 UIntMax;
#else #else