public inbox for gcc-bugs@sourceware.org
help / color / mirror / Atom feed
From: "demoonlit at panathenaia dot halfmoon.jp" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug ada/64349] [5 Regression] Bootstrapping Ada fails on darwin(9|10).
Date: Tue, 27 Jan 2015 03:01:00 -0000 [thread overview]
Message-ID: <bug-64349-4-wp1Mfyd225@http.gcc.gnu.org/bugzilla/> (raw)
In-Reply-To: <bug-64349-4@http.gcc.gnu.org/bugzilla/>
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64349
yuta tomino <demoonlit at panathenaia dot halfmoon.jp> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |demoonlit at panathenaia dot halfm
| |oon.jp
--- Comment #10 from yuta tomino <demoonlit at panathenaia dot halfmoon.jp> ---
Please move #ifdef in the correct order.
--- a/gcc/ada/env.c
+++ b/gcc/ada/env.c
@@ -44,12 +44,6 @@
#include <stdlib.h>
#endif
-#if defined (__APPLE__) && !defined (__arm__)
-/* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not
- available on iOS. */
-#include <crt_externs.h>
-#endif
-
#if defined (__vxworks)
#if defined (__RTP__)
/* On VxWorks 6 Real-Time process mode, environ is defined in unistd.h.
*/
@@ -78,6 +72,12 @@
#include "system.h"
#endif /* IN_RTS */
+#if defined (__APPLE__) && !defined (__arm__)
+/* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not
+ available on iOS. */
+#include <crt_externs.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -215,11 +215,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
next prev parent reply other threads:[~2015-01-27 3:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-18 11:05 [Bug bootstrap/64349] New: " dominiq at lps dot ens.fr
2014-12-18 11:07 ` [Bug bootstrap/64349] " dominiq at lps dot ens.fr
2014-12-18 11:28 ` iains at gcc dot gnu.org
2014-12-19 10:06 ` dominiq at lps dot ens.fr
2014-12-19 11:51 ` [Bug ada/64349] " rguenth at gcc dot gnu.org
2015-01-07 10:16 ` charlet at gcc dot gnu.org
2015-01-07 10:17 ` charlet at gcc dot gnu.org
2015-01-13 10:28 ` rguenth at gcc dot gnu.org
2015-01-13 10:31 ` dominiq at lps dot ens.fr
2015-01-13 10:37 ` iains at gcc dot gnu.org
2015-01-27 3:01 ` demoonlit at panathenaia dot halfmoon.jp [this message]
2015-01-29 11:03 ` dominiq at lps dot ens.fr
2015-01-30 15:14 ` charlet at gcc dot gnu.org
2015-01-30 15:17 ` charlet at gcc dot gnu.org
2015-02-05 9:10 ` charlet at gcc dot gnu.org
2015-02-05 9:11 ` charlet at gcc dot gnu.org
2015-02-05 14:16 ` dominiq at lps dot ens.fr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bug-64349-4-wp1Mfyd225@http.gcc.gnu.org/bugzilla/ \
--to=gcc-bugzilla@gcc.gnu.org \
--cc=gcc-bugs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).