Merge from gcc:

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 6806e580b970fd44a25a87e615a0bc5774d84a17..eca027f19e3dada63009c68e290f7ed09fabbcec 100755 (executable)
--- a/configure
+++ b/configure
@@ -1865,6 +1865,7 @@ target_libraries="target-libgcc \
                target-libiberty \
                target-libgloss \
                target-newlib \
+               target-libgomp \
                target-libstdc++-v3 \
                target-libmudflap \
                target-libssp \
@@ -1872,8 +1873,7 @@ target_libraries="target-libgcc \
                target-boehm-gc \
                ${libgcj} \
                target-libobjc \
-               target-libada \
-               target-libgomp"
+               target-libada"
 
 # these tools are built using the target libraries, and are intended to
 # run only in the target environment
@@ -2506,6 +2506,14 @@ case "${target}" in
   m68k-apollo-*)
     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
     ;;
+  mips*-sde-elf*)
+    skipdirs="$skipdirs target-libiberty"
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    if test x$with_newlib = xyes; then
+      noconfigdirs="$noconfigdirs gprof"
+    fi
+    libgloss_dir=mips
+    ;;
   mips*-*-irix5*)
     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
@@ -2519,9 +2527,6 @@ case "${target}" in
   mips*-*-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
-  mips64*-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
   mips*-*-linux*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
@@ -2726,8 +2731,10 @@ case "${host}" in
     host_makefile_frag="config/mh-cygwin"
     ;;
   *-mingw32*)
+    host_makefile_frag="config/mh-mingw"
     ;;
   *-mingw64*)
+    host_makefile_frag="config/mh-mingw"
     ;;
   *-interix*)
     host_makefile_frag="config/mh-interix"
@@ -5272,6 +5279,9 @@ case "${target}" in
   mips*-sde-elf*)
     target_makefile_frag="config/mt-sde"
     ;;
+  mipsisa*-*-elfoabi*)
+    target_makefile_frag="config/mt-mips-elfoabi"
+    ;;
   *-*-netware*)
     target_makefile_frag="config/mt-netware"
     ;;
@@ -6182,10 +6192,10 @@ case " $build_configdirs " in
   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
   *)
 
-    # For an installed makeinfo, we require it to be from texinfo 4.4 or
+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"
@@ -12023,10 +12033,10 @@ if test "${enable_stage1_checking+set}" = set; then
   enableval="$enable_stage1_checking"
   stage1_checking=--enable-checking=${enable_stage1_checking}
 else
-  if test "x$enable_checking" = xno; then
+  if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
   stage1_checking=--enable-checking=yes,types
 else
-  stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking
+  stage1_checking=--enable-checking=$enable_checking,types
 fi
 fi;