From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 36FD738582BF; Fri, 9 Sep 2022 13:37:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36FD738582BF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662730666; bh=rKaYv2Pu4zgsnW29IbUWz1JnvFzX/rZNoGlols+etZg=; h=From:To:Subject:Date:From; b=wLvZmKXlwaTVzPKD7krOeJ5OwXtju80A8KQWsQdAVV6jGrOm41XTZ9uQ1AdpdRgOr gRCxcLVfVDblArj18iNUiQpUHMYH5uUq7F/fQ02V6r3RKsbNWOF8kL08YnVyjwYo9R 0faPxF172Y3trJJesv+sVdkisJnniG/NaD6xVE0o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] libgomp: Fix up OMP_PROC_BIND handling [PR106894] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: fa7e73819ec1d6c62223fe2b36b0ce9da27d669b X-Git-Newrev: 1aa03128944dad6b3ad094b1320ed950f62d9cd7 Message-Id: <20220909133746.36FD738582BF@sourceware.org> Date: Fri, 9 Sep 2022 13:37:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1aa03128944dad6b3ad094b1320ed950f62d9cd7 commit 1aa03128944dad6b3ad094b1320ed950f62d9cd7 Author: Jakub Jelinek Date: Fri Sep 9 15:35:18 2022 +0200 libgomp: Fix up OMP_PROC_BIND handling [PR106894] While the first param is char (gomp_global_icv.bind_var), the second param is char * (gomp_bind_var_list), so we shouldn't access it through *(char *). 2022-09-09 Jakub Jelinek PR libgomp/106894 * env.c (initialize_env) : Use char ** instead of char * for dest[1] initialization from params[1]. Formatting fixes. (cherry picked from commit 26a1f4fcb264d110708483815c8c8d7bb4ff6788) Diff: --- libgomp/ChangeLog.omp | 9 +++++++++ libgomp/env.c | 8 +++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 5779390952f..df32c355610 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,12 @@ +2022-09-09 Tobias Burnus + + Backport from mainline: + 2022-09-09 Jakub Jelinek + + PR libgomp/106894 + * env.c (initialize_env) : Use char ** instead of + char * for dest[1] initialization from params[1]. Formatting fixes. + 2022-09-09 Tobias Burnus Backport from mainline: diff --git a/libgomp/env.c b/libgomp/env.c index 82e22ac789f..92f32f72020 100644 --- a/libgomp/env.c +++ b/libgomp/env.c @@ -2184,12 +2184,10 @@ initialize_env (void) *(int *) (host_envvars[omp_var].dest[1]) = *(int *) params[1]; break; case PARSE_BIND: - *(char *) (host_envvars[omp_var].dest[0]) - = *(char *) params[0]; - *(char *) (host_envvars[omp_var].dest[1]) - = *(char *) params[1]; + *(char *) (host_envvars[omp_var].dest[0]) = *(char *) params[0]; + *(char **) (host_envvars[omp_var].dest[1]) = *(char **) params[1]; *(unsigned long *) (host_envvars[omp_var].dest[2]) - = *(unsigned long *) params[2]; + = *(unsigned long *) params[2]; break; } }