From ff89cb01b7f1367a71be2b5df30c0768b20b2da8 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Wed, 23 Jul 2003 21:17:43 +0000 Subject: [PATCH] atomicity.h: Change _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK to _GLIBCXX_INST_ATOMICITY_LOCK to... * config/cpu/hppa/atomicity.h: Change _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK to _GLIBCXX_INST_ATOMICITY_LOCK to match misc-inst.cc From-SVN: r69720 --- libstdc++-v3/ChangeLog | 6 ++++++ 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 fcbbee7f0ea..d6ea34c3a9b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-07-23 Steve Ellcey + + * 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 * include/c_std/cmath.tcc: Use _GLIBCXX_ prefix on file guard. diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h index 7e527ef6c5f..a717ab555a4 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