Revert the AM_ZLIB change in gas

[deliverable/binutils-gdb.git] / gas / configure.ac

diff --git a/gas/configure.ac b/gas/configure.ac
index e2fc1b7cc64d8f0dd0835ad88541abc665586699..8e05fb89bd924f13881b7fa6c3e08f65598fdaa2 100644 (file)
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -3,7 +3,7 @@ dnl
 dnl And be careful when changing it!  If you must add tests with square
 dnl brackets, be sure changequote invocations surround it.
 dnl
-dnl   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+dnl   Copyright (C) 2012-2015 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -217,6 +217,9 @@ changequote([,])dnl
          mipsisa32r5 | mipsisa32r5el)
            mips_cpu=mips32r5
            ;;
+         mipsisa32r6 | mipsisa32r6el)
+           mips_cpu=mips32r6
+           ;;
          mipsisa64 | mipsisa64el)
            mips_cpu=mips64
            ;;
@@ -229,6 +232,9 @@ changequote([,])dnl
          mipsisa64r5 | mipsisa64r5el)
            mips_cpu=mips64r5
            ;;
+         mipsisa64r6 | mipsisa64r6el)
+           mips_cpu=mips64r6
+           ;;
          mipstx39 | mipstx39el)
            mips_cpu=r3900
            ;;
@@ -238,6 +244,11 @@ changequote([,])dnl
          mipsisa32r2* | mipsisa64r2*)
 changequote(,)dnl
            mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r2//' -e 's/el$//'`
+changequote([,])dnl
+           ;;
+         mipsisa32r6* | mipsisa64r6*)
+changequote(,)dnl
+           mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r6//' -e 's/el$//'`
 changequote([,])dnl
            ;;
          mips64* | mipsisa64* | mipsisa32*)