diff options
| author | Iain Sandoe <iain@codesourcery.com> | 2015-11-28 16:39:30 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-11-28 16:39:30 +0000 |
| commit | 35a88fa501ff2e2fe133e7c0f38768ae703a43b7 (patch) | |
| tree | c59577728b2277dcdbbb852c1996ef9d432ae3e1 /include | |
| parent | e9a3881624886dc523a500a86bfdac6dc58fd0db (diff) | |
| download | gdb-35a88fa501ff2e2fe133e7c0f38768ae703a43b7.zip gdb-35a88fa501ff2e2fe133e7c0f38768ae703a43b7.tar.gz gdb-35a88fa501ff2e2fe133e7c0f38768ae703a43b7.tar.bz2 | |
Fix PR63758 by using the _NSGetEnviron() API on Darwin
include/
Roland McGrath <roland@gnu.org>
PR other/63758
* environ.h: New file.
libiberty/
Roland McGrath <roland@gnu.org>
Iain Sandoe <iain@codesourcery.com>
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228942 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/environ.h | 33 |
2 files changed, 38 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 01a25de..74f9cdc 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -13,6 +13,11 @@ * bfdlink.h (bfd_link_info): Add call_nop_as_suffix and call_nop_byte. +2015-10-18 Roland McGrath <roland@gnu.org> + + PR other/63758 + * environ.h: New file. + 2015-10-07 Claudiu Zissulescu <claziss@synopsys.com> * dis-asm.h (arc_get_disassembler): Correct declaration. 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 |