Backported from mainline

	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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188624 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6d97ef9f5584617afe28fd18aeee81c3a47c4aba..fc70728ec4ba2625c89ddd58c9c2a6b72e5facc0 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       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-06-14  Release Manager
 
        * GCC 4.7.1 released.

diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c
index 60693439422fb53268bf8f12d6adb35f478721e9..047d8cdf782cbeb116bb911a2deddaf46799dd8a 100644 (file)
--- 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