diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-11-19 12:24:39 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-11-19 12:24:39 +0100 |
| commit | d10ad8ffac60c5c05393a22990c6f051ab877ee9 (patch) | |
| tree | 8d9c83cf107c091b79fb6155ab53df11a06def12 | |
| parent | 32310747977c02f6b9f7a97ca06cc8b77b3bbd52 (diff) | |
| download | gcc-d10ad8ffac60c5c05393a22990c6f051ab877ee9.zip gcc-d10ad8ffac60c5c05393a22990c6f051ab877ee9.tar.gz gcc-d10ad8ffac60c5c05393a22990c6f051ab877ee9.tar.bz2 | |
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
| -rw-r--r-- | gcc/ada/Makefile.in | 2 | ||||
| -rw-r--r-- | gcc/ada/expect.c | 5 | ||||
| -rw-r--r-- | gcc/ada/lang-specs.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index 88c0df6..82d0141 100644 --- 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 9c76ba5..3566358 100644 --- 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 7b6aa52..7924c23 100644 --- 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} \ |