From: Tristan Gingold <gingold@adacore.com>
Date: Thu, 5 Feb 2015 09:09:51 +0000 (+0000)
Subject: re PR ada/64349 (Bootstrapping Ada fails on darwin(9|10).)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aebab21a5be7d360f64c30baf752183a230d8db5;p=gcc.git

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 2668fcc4066..c5472727992 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 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