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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2668fcc4066e9b852813f2c1beacaac3be299e2f..c547272799241f52c77d9dbd938ccff4ea687f9b 100644 (file)
--- 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 ebcbb6db5584a6b9d95ff90867d7cbd86a05de72..1a2afd64b9d9a93d0ef3a5eec94f250c6c83c9ee 100644 (file)
--- 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