diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 04:02:20 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 04:02:20 +0000 |
| commit | dafa71aaeabf235fe72095d1d96f1f2806fc37b7 (patch) | |
| tree | fafc83f42b8ec16ea233bdbf4e663bb360b327e4 | |
| parent | b4451e15641bf740ca0582668b53b7d4a1aaf004 (diff) | |
| download | ppe42-gcc-dafa71aaeabf235fe72095d1d96f1f2806fc37b7.tar.gz ppe42-gcc-dafa71aaeabf235fe72095d1d96f1f2806fc37b7.zip | |
2003-02-12 Phil Edwards <pme@gcc.gnu.org>
* config/cpu/generic/atomicity.h (_Atomic_add_mutex): Fix declaration.
(_GLIBCPP_NEED_GENERIC_MUTEX): Define for this file.
(_Atomic_add_mutex_once, __gthread_atomic_add_mutex_once): Declare
when we don't have static mutex initialization.
(__exchange_and_add): Use _Atomic_add_mutex_once.
* src/misc-inst.cc: Definitions of all the above.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62818 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/config/cpu/generic/atomicity.h | 25 | ||||
| -rw-r--r-- | libstdc++-v3/src/misc-inst.cc | 18 |
3 files changed, 45 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1cefd52a72f..78182b91990 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2003-02-12 Phil Edwards <pme@gcc.gnu.org> + + * config/cpu/generic/atomicity.h (_Atomic_add_mutex): Fix declaration. + (_GLIBCPP_NEED_GENERIC_MUTEX): Define for this file. + (_Atomic_add_mutex_once, __gthread_atomic_add_mutex_once): Declare + when we don't have static mutex initialization. + (__exchange_and_add): Use _Atomic_add_mutex_once. + * src/misc-inst.cc: Definitions of all the above. + 2003-02-12 Paolo Carlini <pcarlini@unitus.it> PR libstdc++/9563 diff --git a/libstdc++-v3/config/cpu/generic/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity.h index 2cf6c3ced68..829a77c52cb 100644 --- a/libstdc++-v3/config/cpu/generic/atomicity.h +++ b/libstdc++-v3/config/cpu/generic/atomicity.h @@ -1,6 +1,6 @@ // Low-level functions for atomic operations: Generic version -*- C++ -*- -// Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -32,24 +32,35 @@ #include <bits/gthr.h> +#define _GLIBCPP_NEED_GENERIC_MUTEX + typedef int _Atomic_word; namespace __gnu_cxx { - __gthread_mutex_t _Atomic_add_mutex __attribute__ ((__weak__)) - = __GTHREAD_MUTEX_INIT; + extern __gthread_mutex_t _Atomic_add_mutex; + +#ifndef __GTHREAD_MUTEX_INIT + extern __gthread_once_t _Atomic_add_mutex_once; + extern void __gthread_atomic_add_mutex_once(); +#endif } static inline _Atomic_word __attribute__ ((__unused__)) __exchange_and_add (volatile _Atomic_word* __mem, int __val) { - _Atomic_word __result; +#ifndef __GTHREAD_MUTEX_INIT + __gthread_once (&__gnu_cxx::_Atomic_add_mutex_once, + __gnu_cxx::__gthread_atomic_add_mutex_once); +#endif + + _Atomic_word __result; - __gthread_mutex_lock (&__gnu_cxx::_Atomic_add_mutex); + __gthread_mutex_lock (&__gnu_cxx::_Atomic_add_mutex); - __result = *__mem; - *__mem += __val; + __result = *__mem; + *__mem += __val; __gthread_mutex_unlock (&__gnu_cxx::_Atomic_add_mutex); return __result; diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc index e612aa45cab..df2949d04ca 100644 --- a/libstdc++-v3/src/misc-inst.cc +++ b/libstdc++-v3/src/misc-inst.cc @@ -72,3 +72,21 @@ namespace std template volatile int __Atomicity_lock<0>::_S_atomicity_lock; #endif } // namespace std + +#ifdef _GLIBCPP_NEED_GENERIC_MUTEX +namespace __gnu_cxx +{ +#ifdef __GTHREAD_MUTEX_INIT + __gthread_mutex_t _Atomic_add_mutex = __GTHREAD_MUTEX_INIT; +#else + // generic atomicity.h without static initialization + __gthread_mutex_t _Atomic_add_mutex; + __gthread_once_t _Atomic_add_mutex_once = __GTHREAD_ONCE_INIT; + void __gthread_atomic_add_mutex_once() + { + __GTHREAD_MUTEX_INIT_FUNCTION (&_Atomic_add_mutex); + } +#endif +} // namespace __gnu_cxx +#endif // _GLIBCPP_NEED_GLOBAL_MUTEX + |
