diff options
| author | Tristan Gingold <gingold@adacore.com> | 2015-02-05 09:09:51 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-02-05 10:09:51 +0100 |
| commit | aebab21a5be7d360f64c30baf752183a230d8db5 (patch) | |
| tree | b29b7741bd9c70313d8ead05bc8855a924e97c67 | |
| parent | cc6a430fb2273dd9ce5d096791455ec31056554f (diff) | |
| download | gcc-aebab21a5be7d360f64c30baf752183a230d8db5.zip gcc-aebab21a5be7d360f64c30baf752183a230d8db5.tar.gz gcc-aebab21a5be7d360f64c30baf752183a230d8db5.tar.bz2 | |
re PR ada/64349 (Bootstrapping Ada fails on darwin(9|10).)
2015-02-05 Tristan Gingold <gingold@adacore.com>
PR ada/64349
* env.c: Fix thinko: handle Darwin case before default one.
From-SVN: r220437
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/env.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2668fcc..c547272 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-02-05 Tristan Gingold <gingold@adacore.com> + + PR ada/64349da/64349 + * env.c: Fix thinko: handle Darwin case before default one. + 2015-01-30 Robert Dewar <dewar@adacore.com> * a-assert.adb: Minor reformatting. diff --git a/gcc/ada/env.c b/gcc/ada/env.c index ebcbb6d..1a2afd6 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -214,11 +214,11 @@ __gnat_environ (void) #elif defined (sun) extern char **_environ; return _environ; +#elif defined (__APPLE__) && !defined (__arm__) + return *_NSGetEnviron (); #elif ! (defined (__vxworks)) extern char **environ; return environ; -#elif defined (__APPLE__) && !defined (__arm__) - return *_NSGetEnviron (); #else return environ; #endif |