diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-23 08:31:30 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-23 08:31:30 +0000 |
| commit | 4d33a3e373c5c79b079c0b81ba6e38761a05b13d (patch) | |
| tree | 03d149b0d953752a98e5d96c404fbc0f363b98e6 /libatomic | |
| parent | bd11046c067c9b3bbae45b2723d7bae0ccc99da2 (diff) | |
| download | gcc-4d33a3e373c5c79b079c0b81ba6e38761a05b13d.tar.gz | |
2012-05-23 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187788 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187795 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libatomic')
| -rw-r--r-- | libatomic/ChangeLog | 5 | ||||
| -rw-r--r-- | libatomic/tas_n.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 4f170244a2e..ac46c3f2890 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,8 @@ +2012-05-22 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + PR other/53231 + * tas_n.c (libat_test_and_set): Correct return. Remove unused variable. + 2012-05-16 H.J. Lu <hongjiu.lu@intel.com> * configure: Regenerated. diff --git a/libatomic/tas_n.c b/libatomic/tas_n.c index f137707f711..faa8e263794 100644 --- a/libatomic/tas_n.c +++ b/libatomic/tas_n.c @@ -85,7 +85,7 @@ SIZE(libat_test_and_set) (UTYPE *mptr, int smodel) bool SIZE(libat_test_and_set) (UTYPE *mptr, int smodel) { - UTYPE oldval, newval; + UTYPE oldval; UWORD magic; pre_seq_barrier (smodel); @@ -97,7 +97,7 @@ SIZE(libat_test_and_set) (UTYPE *mptr, int smodel) protect_end (mptr, magic); post_seq_barrier (smodel); - return ret != 0; + return oldval != 0; } #define DONE 1 |