Hi,
This is mostly Roland's patch with one extra case added by me plus I moved the
new header to include/ as suggested in c#7 of the PR since there are other
users for it in the compiler.
==
On Darwin platforms, when referenced from the main executable, it's permitted
to access *_environ directly. When the environment is required from a shared
library then the _NSGetEnviron() API should be used. Since libiberty is used
from shared libraries (such as libcc1) this mechanism should be applied here.
OK for trunk and active branches?
Iain
include/
Roland McGrath <[email protected]>
PR other/63758
* environ.h: New file.
libiberty/
Roland McGrath <[email protected]>
Iain Sandoe <[email protected]>
PR other/63758
* pex-unix.c: Obtain the environment interface from settings in
environ.h
rather than in-line code. Update copyright date.
* setenv.c: Likewise.
* xmalloc.c: Likewise.
From 9dec1e4a7a62a1f556dce6e35133e4c503898a74 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <[email protected]>
Date: Mon, 7 Sep 2015 10:22:07 +0100
Subject: [PATCH] [libiberty] Provide support for indirect use of _environ by
Darwin.
When referenced from the main executable, it's permitted to access
*_environ directly. When environ is required from a shared library then
the NSGetEnviron() API should be used. Since libiberty is used from
shared libraries (such as libcc1) this mechanism should be applied here.
---
include/environ.h | 33 +++++++++++++++++++++++++++++++++
libiberty/pex-unix.c | 5 ++---
libiberty/setenv.c | 10 +++-------
libiberty/xmalloc.c | 5 +++--
4 files changed, 41 insertions(+), 12 deletions(-)
create mode 100644 include/environ.h
diff --git a/include/environ.h b/include/environ.h
new file mode 100644
index 0000000..c18902b
--- /dev/null
+++ b/include/environ.h
@@ -0,0 +1,33 @@
+/* Declare the environ system variable.
+ Copyright (C) 2015 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB. If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+/* On OSX, the environ variable can be used directly in the code of an
+ executable, but cannot be used in the code of a shared library (such as
+ GCC's liblto_plugin, which links in libiberty code). Instead, the
+ function _NSGetEnviron can be called to get the address of environ. */
+
+#ifndef HAVE_ENVIRON_DECL
+# ifdef __APPLE__
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron ())
+# else
+extern char **environ;
+# endif
+# define HAVE_ENVIRON_DECL
+#endif
diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c
index 0715115..b48f315 100644
--- a/libiberty/pex-unix.c
+++ b/libiberty/pex-unix.c
@@ -2,7 +2,7 @@
with other subprocesses), and wait for it. Generic Unix version
(also used for UWIN and VMS).
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2009,
- 2010 Free Software Foundation, Inc.
+ 2010, 2015 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
@@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA. */
#include "config.h"
#include "libiberty.h"
#include "pex-common.h"
+#include "environ.h"
#include <stdio.h>
#include <signal.h>
@@ -390,8 +391,6 @@ pex_child_error (struct pex_obj *obj, const char
*executable,
/* Execute a child. */
-extern char **environ;
-
#if defined(HAVE_SPAWNVE) && defined(HAVE_SPAWNVPE)
/* Implementation of pex->exec_child using the Cygwin spawn operation. */
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 714ca0a..5b51193 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011 Free Software Foundation,
- Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011, 2015
+ Free Software Foundation, Inc.
This file based on setenv.c in the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -62,11 +62,7 @@ extern int errno;
#endif
#define __environ environ
-#ifndef HAVE_ENVIRON_DECL
-#ifndef environ
-extern char **environ;
-#endif
-#endif
+#include "environ.h"
#undef setenv
#undef unsetenv
diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index 3e97aab..f849aee 100644
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -1,5 +1,6 @@
/* memory allocation routines with error checking.
- Copyright 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+ Copyright 1989, 1990, 1991, 1992, 1993, 1994, 2015
+ Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
@@ -65,6 +66,7 @@ function will be called to print an error message and
terminate execution.
#endif
#include "ansidecl.h"
#include "libiberty.h"
+#include "environ.h"
#include <stdio.h>
@@ -117,7 +119,6 @@ void
xmalloc_failed (size_t size)
{
#ifdef HAVE_SBRK
- extern char **environ;
size_t allocated;
if (first_break != NULL)
--
2.2.1
