Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Jul 2016 17:18:08 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r303400 - head/contrib/libcxxrt
Message-ID:  <201607271718.u6RHI8Xg015580@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Wed Jul 27 17:18:08 2016
New Revision: 303400
URL: https://svnweb.freebsd.org/changeset/base/303400

Log:
  libcxxrt: fix demangling of wchar_t
  
  'wchar_t' is 7 characters long, not 6. r303297 fixed this in libelftc,
  but not the second copy of this file that we have in libcxxrt.
  
  PR:		208661
  Submitted by:	Daniel McRobb
  Obtained from:	ELF Tool Chain r3480
  MFC after:	3 days

Modified:
  head/contrib/libcxxrt/libelftc_dem_gnu3.c

Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c
==============================================================================
--- head/contrib/libcxxrt/libelftc_dem_gnu3.c	Wed Jul 27 17:11:03 2016	(r303399)
+++ head/contrib/libcxxrt/libelftc_dem_gnu3.c	Wed Jul 27 17:18:08 2016	(r303400)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607271718.u6RHI8Xg015580>