From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 66F16385022A; Mon, 12 Sep 2022 07:22:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66F16385022A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662967347; bh=jvthSl2m6D+Fw767KUTqVJfld+61JgB05MR77gRWCXQ=; h=From:To:Subject:Date:From; b=AKGjO8liSG2PhIgL1qOgTiD5nIc62F7Mj6gNC4kIsEdNVIxzkuFs1di7uk1WMHhNd JDkQJUhVkAKs3WzKGRdZ4VUWWgPvy6x3wFWb/VQdb4gB63GU9ao95Xu3aDmrWS2nBG zZIza1ZFOpAKbt1IHtuQlQJ3SWSrXY1zinLNoQuo= 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: Use libiberty environ.h to declare the environment pointer. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 2b6ad53fd76c7bb9605be417d137a7d9a18f2117 X-Git-Newrev: 7fbe23803a00cfb714073a25a095db645c61a405 Message-Id: <20220912072227.66F16385022A@sourceware.org> Date: Mon, 12 Sep 2022 07:22:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7fbe23803a00cfb714073a25a095db645c61a405 commit 7fbe23803a00cfb714073a25a095db645c61a405 Author: Iain Sandoe Date: Mon Sep 12 09:18:58 2022 +0200 libgomp: Use libiberty environ.h to declare the environment pointer. This allows for target-specific mechanisms for finding the pointer. Signed-off-by: Iain Sandoe libgomp/ChangeLog: * env.c (initialize_env): Include libiberty environ.h. (cherry picked from commit 7d37c7f67c1bb75f85ad0c07bfff51ca579e1476) Diff: --- libgomp/ChangeLog.omp | 7 +++++++ libgomp/env.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 4eb6cfaf1b1..e25a9ad8c49 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,10 @@ +2022-09-12 Tobias Burnus + + Backport from mainline: + 2022-09-10 Iain Sandoe + + * env.c (initialize_env): Include libiberty environ.h. + 2022-09-12 Tobias Burnus Backport from mainline: diff --git a/libgomp/env.c b/libgomp/env.c index 92f32f72020..ac8c764db60 100644 --- a/libgomp/env.c +++ b/libgomp/env.c @@ -60,6 +60,7 @@ #endif /* LIBGOMP_OFFLOADED_ONLY */ #include "secure_getenv.h" +#include "environ.h" /* Default values of ICVs according to the OpenMP standard. */ const struct gomp_default_icv gomp_default_icv_values = { @@ -2033,7 +2034,6 @@ startswith (const char *str, const char *prefix) static void __attribute__((constructor)) initialize_env (void) { - extern char **environ; char **env; int omp_var, dev_num = 0, dev_num_len = 0, i; bool ignore = false;