darwin7.h (MATH_LIBRARY): Remove.

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.

From-SVN: r83603

gcc/ChangeLog

+2004-06-24  Andrew Pinski  <apinski@apple.com>
+
+	* 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.
+
 2004-06-24  Revital Eres  <eres@il.ibm.com>
 
 	* loop-iv.c (iv_analyze, simple_set_p): Support for identifying

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.  */
 

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}"

libgfortran/ChangeLog

+2004-06-24  Andrew Pinski  <apinski@apple.com>
+
+	* configure.ac: Remove check for libmx.
+	* configure: Regenerate.
+
 2004-06-22  Janne Blomqvist  <jblomqvi@cc.hut.fi>
 
 	PR fortran/15750

libgfortran/configure.ac

@@ -160,9 +160,6 @@ AC_CHECK_HEADER([complex.h],[AC_DEFINE([HAVE_COMPLEX_H], [1], [complex.h exists]
 # Check for complex math functions
 AC_CHECK_LIB([m],[csin],[need_math="no"],[need_math="yes"])
 
-# Check for complex math functions in -lmx also
-AC_CHECK_LIB([mx],[csin],[need_math="no"],[need_math="yes"])
-
 # Check for library functions.
 AC_CHECK_FUNCS(getrusage times)
 

libstdc++-v3/ChangeLog

+2004-06-23  Andrew Pinski  <apinski@apple.com>
+
+	* linkage.m4: Remove check for libmx.	
+	* configure: Regenerate.
+
 2004-06-23  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/16154

libstdc++-v3/linkage.m4

@@ -380,11 +380,6 @@ AC_DEFUN([GLIBCXX_CHECK_MATH_SUPPORT], [
   ac_save_LIBS="$LIBS"
   LIBS="$LIBS $libm"
 
-  dnl Check libmx
-  AC_CHECK_LIB(mx, sqrtf, libmx="-lmx")
-  dnl ac_save_LIBS="$LIBS"
-  LIBS="$LIBS $libmx"
-
   dnl Check to see if certain C math functions exist.
   GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
   GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)