aboutsummaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog6
-rw-r--r--libgomp/config/linux/lock.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index f8d57398bc6..f22c41a728f 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-06 Jakub Jelinek <jakub@redhat.com>
+
+ PR libgomp/52993
+ * config/linux/lock.c (gomp_init_nest_lock_25): Fix up last
+ argument to memset call.
+
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
* configure: Regenerated.
diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c
index 60693439422..047d8cdf782 100644
--- a/libgomp/config/linux/lock.c
+++ b/libgomp/config/linux/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
Contributed by Richard Henderson <rth@redhat.com>.
This file is part of the GNU OpenMP Library (libgomp).
@@ -175,7 +175,7 @@ static inline int gomp_tid (void)
void
gomp_init_nest_lock_25 (omp_nest_lock_25_t *lock)
{
- memset (lock, 0, sizeof (lock));
+ memset (lock, 0, sizeof (*lock));
}
void