OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mt_allocator.cc: Fix assumption that sizeof(void *) is equal to sizeof(size_t).

Browse Source 
2014-11-14  Joel Sherrill <joel.sherrill@oarcorp.com>

	* src/c++98/mt_allocator.cc: Fix assumption that sizeof(void *) is
	equal to sizeof(size_t). The m32c breaks this assumption.

From-SVN: r217576
This commit is contained in:
Joel Sherrill 2014-11-14 16:57:20 +00:00 committed by Joel Sherrill
parent ba86734cb3
commit 2c59c2d1a2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-14 Joel Sherrill <joel.sherrill@oarcorp.com>
* src/c++98/mt_allocator.cc: Fix assumption that sizeof(void *) is
equal to sizeof(size_t). The m32c breaks this assumption.
2014-11-14 Jonathan Wakely <jwakely@redhat.com> 2014-11-14 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver: Add new exports. * config/abi/pre/gnu.ver: Add new exports.

9
libstdc++-v3/src/c++98/mt_allocator.cc
View File

@ -31,6 +31,11 @@
#include <ext/mt_allocator.h> #include <ext/mt_allocator.h>
#include <cstring> #include <cstring>
// The include file is needed for uintptr_t. If this file does not compile,
// check to make sure the target has <stdint.h> and that it provides
// uintptr_t.
#include <stdint.h>
namespace namespace
{ {
#ifdef __GTHREADS #ifdef __GTHREADS
@ -74,7 +79,7 @@ namespace
__freelist& freelist = get_freelist(); __freelist& freelist = get_freelist();
{ {
__gnu_cxx::__scoped_lock sentry(get_freelist_mutex()); __gnu_cxx::__scoped_lock sentry(get_freelist_mutex());
size_t _M_id = reinterpret_cast<size_t>(__id); uintptr_t _M_id = reinterpret_cast<uintptr_t>(__id);
typedef __gnu_cxx::__pool<true>::_Thread_record _Thread_record; typedef __gnu_cxx::__pool<true>::_Thread_record _Thread_record;
_Thread_record* __tr = &freelist._M_thread_freelist_array[_M_id - 1]; _Thread_record* __tr = &freelist._M_thread_freelist_array[_M_id - 1];
@ -627,7 +632,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
__freelist& freelist = get_freelist(); __freelist& freelist = get_freelist();
void* v = __gthread_getspecific(freelist._M_key); void* v = __gthread_getspecific(freelist._M_key);
size_t _M_id = (size_t)v; uintptr_t _M_id = (uintptr_t)v;
if (_M_id == 0) if (_M_id == 0)
{ {
{ {