diff options
| author | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-28 22:46:32 +0000 |
|---|---|---|
| committer | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-28 22:46:32 +0000 |
| commit | 9799b8833bd8df1461bd5839f4a7833cb5eef185 (patch) | |
| tree | 94149ba593bcd16f704c428eb1aac6a7defdee9d | |
| parent | 08404d9c66fc31c270ae2364186c6072267864ea (diff) | |
| download | gcc-9799b8833bd8df1461bd5839f4a7833cb5eef185.tar.gz | |
* config/cpu/hppa/atomicity.h (__atomic_add): Make first argument
volatile.
* config/os/hpux/os_defines.h (_GLIBCXX_INST_ATOMICITY_LOCK): Use
__GXX_WEAK__ instead of _GLIBCXX_SUPPORTS_WEAK.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78633 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/cpu/hppa/atomicity.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/hpux/os_defines.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9af9d868cd0..44f6fcc46bb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-02-28 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * config/cpu/hppa/atomicity.h (__atomic_add): Make first argument + volatile. + * config/os/hpux/os_defines.h (_GLIBCXX_INST_ATOMICITY_LOCK): Use + __GXX_WEAK__ instead of _GLIBCXX_SUPPORTS_WEAK. + 2004-02-28 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (num_get<>::_M_extract_float): diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h index 2b1ce90de47..d173976e68e 100644 --- a/libstdc++-v3/config/cpu/hppa/atomicity.h +++ b/libstdc++-v3/config/cpu/hppa/atomicity.h @@ -76,7 +76,7 @@ namespace __gnu_cxx void __attribute__ ((__unused__)) - __atomic_add(_Atomic_word* __mem, int __val) + __atomic_add(volatile _Atomic_word* __mem, int __val) { int tmp; volatile int& lock = _Atomicity_lock<0>::_S_atomicity_lock; diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h index b83516dd260..64962fedb1c 100644 --- a/libstdc++-v3/config/os/hpux/os_defines.h +++ b/libstdc++-v3/config/os/hpux/os_defines.h @@ -1,6 +1,6 @@ // Specific definitions for HPUX -*- C++ -*- -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2004 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 @@ -93,7 +93,7 @@ typedef long int __padding_type; /* We need explicit instantiation of the atomicity lock on HPPA if there is no weak support. */ -#if !defined(_GLIBCXX_SUPPORTS_WEAK) && defined (__hppa__) +#if !__GXX_WEAK__ && defined (__hppa__) #define _GLIBCXX_INST_ATOMICITY_LOCK 1 #endif |