This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch for libstdc++-v3 cut and paste error
- From: Steve Ellcey <sje at cup dot hp dot com>
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Date: Wed, 23 Jul 2003 09:14:49 -0700 (PDT)
- Subject: Patch for libstdc++-v3 cut and paste error
- Reply-to: sje at cup dot hp dot com
I am getting duplicate __Atomicity_lock's on hppa due to what is
probably a cut and paste error in config/cpu/hppa/atomicity.h. The
macro around __Atomicity_lock was changed from
_GLIBCPP_INST_ATOMICITY_LOCK to _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK but
int misc-inst.cc it was changed from _GLIBCPP_INST_ATOMICITY_LOCK to
_GLIBCXX_INST_ATOMICITY_LOCK.
Since _GLIBCXX_INST_ATOMICITY_LOCK makes more sense, here is a patch to
change config/cpu/hppa/atomicity.h to match misc-inst.cc.
OK to check in?
Steve Ellcey
sje@cup.hp.com
2003-07-23 Steve Ellcey <sje@cup.hp.com>
* include/c_std/cmath.tcc: Change _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK
to _GLIBCXX_INST_ATOMICITY_LOCK to match misc-inst.cc
*** gcc.orig/gcc/libstdc++-v3/config/cpu/hppa/atomicity.h Wed Jul 23 08:59:17 2003
--- gcc/gcc/libstdc++-v3/config/cpu/hppa/atomicity.h Wed Jul 23 08:59:39 2003
*************** __Atomicity_lock<__inst>::_S_atomicity_l
*** 34,42 ****
/* Because of the lack of weak support when using the hpux
som linker, we explicitly instantiate the atomicity lock
! in src/misc-inst.cc when _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK
is defined. */
! #ifndef _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK
template volatile int __Atomicity_lock<0>::_S_atomicity_lock;
#endif
--- 34,42 ----
/* Because of the lack of weak support when using the hpux
som linker, we explicitly instantiate the atomicity lock
! in src/misc-inst.cc when _GLIBCXX_INST_ATOMICITY_LOCK
is defined. */
! #ifndef _GLIBCXX_INST_ATOMICITY_LOCK
template volatile int __Atomicity_lock<0>::_S_atomicity_lock;
#endif