summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-08-01 16:18:01 +0000
committeremaste <emaste@FreeBSD.org>2016-08-01 16:18:01 +0000
commita53bbc9512a876f251026f8f275b376d68a8d48e (patch)
tree597482476dfeb267bf75b5c6284321cacc5c6687
parent741f2fa16af62894479302e33f8aa0c88119d8eb (diff)
downloadFreeBSD-src-a53bbc9512a876f251026f8f275b376d68a8d48e.zip
FreeBSD-src-a53bbc9512a876f251026f8f275b376d68a8d48e.tar.gz
iMFC r303400: libcxxrt: fix demangling of wchar_t
'wchar_t' is 7 characters long, not 6. r303297 (MFC'd in r303398) fixed this in libelftc, but not the second copy of this file that we have in libcxxrt. PR: 208661 Approved by: re (gjb)
-rw-r--r--contrib/libcxxrt/libelftc_dem_gnu3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libcxxrt/libelftc_dem_gnu3.c b/contrib/libcxxrt/libelftc_dem_gnu3.c
index 70ef3e8..2b38c73 100644
--- a/contrib/libcxxrt/libelftc_dem_gnu3.c
+++ b/contrib/libcxxrt/libelftc_dem_gnu3.c
@@ -2842,7 +2842,7 @@ again:
case 'w':
/* wchar_t */
- if (!cpp_demangle_push_str(ddata, "wchar_t", 6))
+ if (!cpp_demangle_push_str(ddata, "wchar_t", 7))
goto clean;
++ddata->cur;
goto rtn;
OpenPOWER on IntegriCloud