Merging r196612:
------------------------------------------------------------------------
r196612 | wdietz2 | 2013-12-06 13:49:18 -0800 (Fri, 06 Dec 2013) | 1 line

Fix integer tests on platforms where uint64_t is 'unsigned long long'.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@196870 91177308-0d34-0410-b5e6-96231b3b80d8
Merging r196799:
------------------------------------------------------------------------
r196799 | wdietz2 | 2013-12-09 11:04:33 -0800 (Mon, 09 Dec 2013) | 1 line

ubsan: Fix typo in 'TypeCheck/vptr.cpp' test to resolve 32bit failure.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@196871 91177308-0d34-0410-b5e6-96231b3b80d8