From aebab21a5be7d360f64c30baf752183a230d8db5 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Thu, 5 Feb 2015 09:09:51 +0000 Subject: [PATCH] re PR ada/64349 (Bootstrapping Ada fails on darwin(9|10).) 2015-02-05 Tristan Gingold PR ada/64349 * env.c: Fix thinko: handle Darwin case before default one. From-SVN: r220437 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/env.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2668fcc4066..c5472727992 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-02-05 Tristan Gingold + + PR ada/64349da/64349 + * env.c: Fix thinko: handle Darwin case before default one. + 2015-01-30 Robert Dewar * a-assert.adb: Minor reformatting. diff --git a/gcc/ada/env.c b/gcc/ada/env.c index ebcbb6db558..1a2afd64b9d 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 -- 2.30.2