diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-01-07 11:15:18 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-01-07 11:15:18 +0100 |
| commit | 6a989c79d4ac94a8922e97523ff13965ed5b0283 (patch) | |
| tree | b237f7a384cd6d29be7cca594f2ba682e4c498f7 /gcc/ada/env.c | |
| parent | 1c85591cabcde20a01a2ecb90d857625a5681ae4 (diff) | |
| download | gcc-6a989c79d4ac94a8922e97523ff13965ed5b0283.zip gcc-6a989c79d4ac94a8922e97523ff13965ed5b0283.tar.gz gcc-6a989c79d4ac94a8922e97523ff13965ed5b0283.tar.bz2 | |
[multiple changes]
2015-01-07 Vincent Celier <celier@adacore.com>
* clean.adb: Minor error message change.
2015-01-07 Tristan Gingold <gingold@adacore.com>
PR ada/64349
* env.c (__gnat_environ): Adjust for darwin9/darwin10.
2015-01-07 Javier Miranda <miranda@adacore.com>
* sem_ch10.adb (Analyze_With_Clause): Compiling under -gnatq
protect the frontend against never ending recursion caused by
circularities in the sources.
From-SVN: r219290
Diffstat (limited to 'gcc/ada/env.c')
| -rw-r--r-- | gcc/ada/env.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ada/env.c b/gcc/ada/env.c index 95308130..f8608bc 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -44,6 +44,12 @@ #include <stdlib.h> #endif +#if defined (__APPLE__) && !defined (__arm__) +/* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not + available on iOS. */ +#include <crt_externs.h> +#endif + #if defined (__vxworks) #if defined (__RTP__) /* On VxWorks 6 Real-Time process mode, environ is defined in unistd.h. */ @@ -212,6 +218,8 @@ __gnat_environ (void) #elif ! (defined (__vxworks)) extern char **environ; return environ; +#elif defined (__APPLE__) && !defined (__arm__) + return *_NSGetEnviron (); #else return environ; #endif |