summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhihao Yuan <zy@miator.net>2018-08-01 05:21:26 +0000
committerZhihao Yuan <zy@miator.net>2018-08-01 05:21:26 +0000
commit63ebd3bd24d414737e5404923dcd1b8dbdb8ee46 (patch)
treebba68281e16dcce9aeb218389fd02e6e271fe8ad
parent02f79eae06895d16d5b1d2e8803d17997437d73f (diff)
downloadbcm5719-llvm-63ebd3bd24d414737e5404923dcd1b8dbdb8ee46.tar.gz
bcm5719-llvm-63ebd3bd24d414737e5404923dcd1b8dbdb8ee46.zip
[libc++] Fix build failures after merging <charconv>
Summary: - fix a stupid unit test typo - add <charconv> symbols to Linux abilist Reviewers: EricWF Subscribers: christof, ldionne, cfe-commits Differential Revision: https://reviews.llvm.org/D50130 llvm-svn: 338486
-rw-r--r--libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist2
-rw-r--r--libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp1
-rw-r--r--libcxx/test/support/charconv_test_helpers.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist b/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
index c883a593ee8..833342ca899 100644
--- a/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
+++ b/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
@@ -1192,6 +1192,8 @@
{'name': '_ZNSt3__15wclogE', 'is_defined': True, 'type': 'OBJECT', 'size': 160}
{'name': '_ZNSt3__15wcoutE', 'is_defined': True, 'type': 'OBJECT', 'size': 160}
{'name': '_ZNSt3__16__clocEv', 'is_defined': True, 'type': 'FUNC'}
+{'name': '_ZNSt3__16__itoa8__u64toaEmPc', 'is_defined': True, 'type': 'FUNC'}
+{'name': '_ZNSt3__16__itoa8__u32toaEjPc', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIaaEEPaEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIccEEPcEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIddEEPdEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
diff --git a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
index e5a93b49735..3fc533a772f 100644
--- a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
+++ b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
@@ -37,6 +37,7 @@ struct test_basics : roundtrip_test_base<T>
using xl = std::numeric_limits<T>;
test(1, b);
+ test(-1, b);
test(xl::lowest(), b);
test((xl::max)(), b);
test((xl::max)() / 2, b);
diff --git a/libcxx/test/support/charconv_test_helpers.h b/libcxx/test/support/charconv_test_helpers.h
index df1b00a67b4..1560fa79aad 100644
--- a/libcxx/test/support/charconv_test_helpers.h
+++ b/libcxx/test/support/charconv_test_helpers.h
@@ -178,7 +178,7 @@ struct roundtrip_test_base
{
assert(x == 0xc);
assert(r2.ptr == buf);
- assert(r.ec == std::errc::invalid_argument);
+ assert(r2.ec == std::errc::invalid_argument);
}
else
{
OpenPOWER on IntegriCloud