summaryrefslogtreecommitdiff
path: root/libatomic
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>2014-11-14 06:05:51 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>2014-11-14 06:05:51 +0000
commitde003e46d83294471999350317cc60dd77693fde (patch)
tree02eddb46bc1d14795d6dc09bf3a8e575d6459b07 /libatomic
parent9c4a19ad5ea0db423735e945901676daf2148007 (diff)
downloadgcc-de003e46d83294471999350317cc60dd77693fde.tar.gz
* cas_n.c (libat_compare_exchange): Add missing cast.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217536 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libatomic')
-rw-r--r--libatomic/ChangeLog4
-rw-r--r--libatomic/cas_n.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 609779f9845..21f4856998b 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-13 Andrew Waterman <waterman@cs.berkeley.edu>
+
+ * cas_n.c (libat_compare_exchange): Add missing cast.
+
2014-11-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR target/63610
diff --git a/libatomic/cas_n.c b/libatomic/cas_n.c
index 801262d551c..a885afab7a5 100644
--- a/libatomic/cas_n.c
+++ b/libatomic/cas_n.c
@@ -70,7 +70,7 @@ SIZE(libat_compare_exchange) (UTYPE *mptr, UTYPE *eptr, UTYPE newval,
mask = -1;
}
- weval = *eptr << shift;
+ weval = (UWORD)*eptr << shift;
wnewval = (UWORD)newval << shift;
woldval = __atomic_load_n (wptr, __ATOMIC_RELAXED);
do