diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/hppa/atomicity.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fcbbee7..d6ea34c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2003-07-23 Steve Ellcey <sje@cup.hp.com> + * config/cpu/hppa/atomicity.h: Change + _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK to _GLIBCXX_INST_ATOMICITY_LOCK + to match misc-inst.cc + +2003-07-23 Steve Ellcey <sje@cup.hp.com> + * include/c_std/cmath.tcc: Use _GLIBCXX_ prefix on file guard. * include/c_std/std_cctype.h: Ditto. * include/c_std/std_cerrno.h: Ditto. diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h index 7e527ef..a717ab5 100644 --- a/libstdc++-v3/config/cpu/hppa/atomicity.h +++ b/libstdc++-v3/config/cpu/hppa/atomicity.h @@ -34,9 +34,9 @@ __Atomicity_lock<__inst>::_S_atomicity_lock __attribute__ ((aligned (16))) = 1; /* 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 + in src/misc-inst.cc when _GLIBCXX_INST_ATOMICITY_LOCK is defined. */ -#ifndef _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK +#ifndef _GLIBCXX_INST_ATOMICITY_LOCK template volatile int __Atomicity_lock<0>::_S_atomicity_lock; #endif |