diff options
| author | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-24 17:53:07 +0000 |
|---|---|---|
| committer | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-24 17:53:07 +0000 |
| commit | 01175c2b44da50e43cd942d2255a038fc27448e9 (patch) | |
| tree | 928bddfe09a626f9116f84ebf37aefc21a0f72a5 /gcc/config | |
| parent | 38cf05e2a191a3cb1b6fd1779a8b32c798e7531e (diff) | |
| download | gcc-01175c2b44da50e43cd942d2255a038fc27448e9.tar.gz | |
gcc/ChangeLog:
* config/darwin7.h (MATH_LIBRARY): Remove.
(LIB_SPEC): Define.
* config/darwin.h (MATH_LIBRARY): Define always to empty.
(LIB_SPEC): Only define if not already defined.
libstdc++/ChangeLog:
* linkage.m4: Remove check for libmx.
* configure: Regenerate.
libgfortran/ChangeLog:
* configure.ac: Remove check for libmx.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83603 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config')
| -rw-r--r-- | gcc/config/darwin.h | 13 | ||||
| -rw-r--r-- | gcc/config/darwin7.h | 9 |
2 files changed, 10 insertions, 12 deletions
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 37122e6253c..582e707aae9 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -39,13 +39,8 @@ Boston, MA 02111-1307, USA. */ #define OBJECT_FORMAT_MACHO -/* Suppress g++ attempt to link in the math library automatically. - (Some Darwin versions have a libm, but they seem to cause problems - for C++ executables.) This needs to be -lmx for Darwin 7.0 and - above. */ -#ifndef MATH_LIBRARY +/* Suppress g++ attempt to link in the math library automatically. */ #define MATH_LIBRARY "" -#endif /* We have atexit. */ @@ -276,10 +271,12 @@ Boston, MA 02111-1307, USA. */ %{dylinker} %{Mach} " -/* Machine dependent libraries. */ +/* Machine dependent libraries but do not redefine it if we already on 7.0 and + above as it needs to link with libmx also. */ -#undef LIB_SPEC +#ifndef LIB_SPEC #define LIB_SPEC "%{!static:-lSystem}" +#endif /* We specify crt0.o as -lcrt0.o so that ld will search the library path. */ diff --git a/gcc/config/darwin7.h b/gcc/config/darwin7.h index 0b215c2f6ab..47a8fa19222 100644 --- a/gcc/config/darwin7.h +++ b/gcc/config/darwin7.h @@ -22,7 +22,8 @@ Boston, MA 02111-1307, USA. */ /* Darwin 7.0 and above have C99 functions. */ #define TARGET_C99_FUNCTIONS 1 -/* But for some reason they are located in libmx so have it - be included when asked for and automatically when linking - with gfortran and g++. */ -#define MATH_LIBRARY "-lmx" +/* Machine dependent libraries, include libmx when compiling on Darwin 7.0 + and above. */ + +#undef LIB_SPEC +#define LIB_SPEC "%{!static:-lSystem -lmx}" |