From 1aa03128944dad6b3ad094b1320ed950f62d9cd7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 9 Sep 2022 15:35:18 +0200 Subject: [PATCH] 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) --- 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 5779390952f0..df32c355610b 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 82e22ac789f3..92f32f72020f 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; } } -- 2.47.2