diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-10-20 12:13:47 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-10-20 12:13:47 +0200 |
| commit | 6fa8f71cf8f9232aac5086ef65b265338468e98d (patch) | |
| tree | ce636ee22f22a65fbe93ce2cc813d6e3a8a4bf72 /gcc/ada/env.c | |
| parent | 36f2e3d311c4679790f29c5cc08c33e1032987d3 (diff) | |
| download | gcc-6fa8f71cf8f9232aac5086ef65b265338468e98d.zip gcc-6fa8f71cf8f9232aac5086ef65b265338468e98d.tar.gz gcc-6fa8f71cf8f9232aac5086ef65b265338468e98d.tar.bz2 | |
[multiple changes]
2015-10-20 Bob Duff <duff@adacore.com>
* a-coinve.adb, a-contai.adb: Update comments.
* pprint.ads: Minor reformatting.
2015-10-20 Tristan Gingold <gingold@adacore.com>
* env.c, init.c: Handle arm64-darwin like arm-darwin.
* tracebak.c: Handle arm64-darwin.
2015-10-20 Bob Duff <duff@adacore.com>
* s-trasym.adb (Symbolic_Traceback): When giving the traceback
as hexadecimal code addresses, separate by blanks instead of LF.
From-SVN: r229039
Diffstat (limited to 'gcc/ada/env.c')
| -rw-r--r-- | gcc/ada/env.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/env.c b/gcc/ada/env.c index 1bf9ef0..8469876 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -50,7 +50,7 @@ #include <stdlib.h> #endif -#if defined (__APPLE__) && !defined (__arm__) +#if defined (__APPLE__) && !(defined (__arm__) || defined (__arm64__)) /* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not available on iOS. */ #include <crt_externs.h> @@ -211,7 +211,7 @@ __gnat_environ (void) #elif defined (__sun__) extern char **_environ; return _environ; -#elif defined (__APPLE__) && !defined (__arm__) +#elif defined (__APPLE__) && !(defined (__arm__) || defined (__arm64__)) return *_NSGetEnviron (); #elif ! (defined (__vxworks)) extern char **environ; |