expect.c: Define __unix__ when __APPLE__ is defined.

	* expect.c: Define __unix__ when __APPLE__ is defined.

	* Makefile.in: Inform the value of the variable GMEM_LIB in the
	Darwin-specific section.

	* lang-specs.h: Change the placement of the %1 marker.

From-SVN: r90908

diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 88c0df66300f21347ccc64f7ef8ec26ffd6268e8..82d0141c9f790d2ac6506d0f4d7f3f44040de956 100644 (file)
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -1410,6 +1410,8 @@ ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
   GNATLIB_SHARED = gnatlib-shared-darwin
   SO_OPTS = -Wl,-flat_namespace
   RANLIB = ranlib -c
+  GMEM_LIB = gmemlib
+
   LIBRARY_VERSION := $(LIB_VERSION)
 
   soext = .dylib

diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c
index 9c76ba5c363c6f847568bc5fc437a9248bee6a93..3566358a3ddece70263cb0e42c1a383fde26cd01 100644 (file)
--- a/gcc/ada/expect.c
+++ b/gcc/ada/expect.c
@@ -53,6 +53,11 @@
 #define __unix__
 #endif
 
+#ifdef __APPLE__
+/* Work around the fact that gcc/cpp does not define "__unix__" on Darwin.  */
+#define __unix__
+#endif
+
 #ifdef _WIN32
 
 #include <windows.h>

diff --git a/gcc/ada/lang-specs.h b/gcc/ada/lang-specs.h
index 7b6aa524a70d9f4391db31b958d785920e1d1322..7924c23729aedb846b089bad260a2a4d072faa9c 100644 (file)
--- a/gcc/ada/lang-specs.h
+++ b/gcc/ada/lang-specs.h
@@ -33,10 +33,10 @@
    "\
  %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
  %{!S:%{!c:%e-c or -S required for Ada}}\
- gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %1 %{!Q:-quiet} %{nostdinc*}\
+ gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %{!Q:-quiet} %{nostdinc*}\
     %{nostdlib*}\
     -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}}\
-    %{O*} %{W*} %{w} %{p} %{pg:-p} %{a} %{f*} %{d*} %{g*&m*} \
+    %{O*} %{W*} %{w} %{p} %{pg:-p} %{a} %{f*} %{d*} %{g*&m*} %1\
     %{!S:%{o*:%w%*-gnatO}} \
     %i %{S:%W{o*}%{!o*:-o %b.s}} \
     %{gnatc*|gnats*: -o %j} \