From 8af3b70e0ff91879ee6c47983fe0eb07cc48018e Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 14 Jun 2012 17:46:53 +0000 Subject: [PATCH 1/1] Backported from mainline 2012-06-06 Jakub Jelinek 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 --- libgomp/ChangeLog | 9 +++++++++ libgomp/config/linux/lock.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 6d97ef9f558..fc70728ec4b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2012-06-14 Jakub Jelinek + + Backported from mainline + 2012-06-06 Jakub Jelinek + + 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 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 . 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 -- 2.11.0