From: Alexandre Oliva <oliva@adacore.com>
Date: Thu, 20 Jun 2019 05:55:34 +0000 (+0000)
Subject: fix ARM --with-fpu option checking and error message
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=170f2d181d45b1197a2873d7dd055530e01d424a;p=gcc.git

fix ARM --with-fpu option checking and error message

Fix the test for failure in parsecpu's checking of the --with-fpu
argument, and the error message that gets printed when the check
fails.

for  gcc/ChangeLog

	* config.gcc: Fix ARM --with-fpu checking and error message.

From-SVN: r272496
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b67ad0ede3..e69a0fc410a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-20  Alexandre Oliva <oliva@adacore.com>
+
+	* config.gcc: Fix ARM --with-fpu checking and error message.
+
 2019-06-19  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/60364 - noreturn after first decl not diagnosed.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index fda048dc12b..7119698779f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4002,12 +4002,13 @@ case "${target}" in
 
 		# see if --with-fpu matches any of the supported FPUs
 		if [ x"$with_fpu" != x ] ; then
+		  val=$with_fpu
 		  fpu=`awk -f ${srcdir}/config/arm/parsecpu.awk \
-			-v cmd="chkfpu $with_fpu" \
+			-v cmd="chkfpu $val" \
 			${srcdir}/config/arm/arm-cpus.in`
-		  if [ "$fpu" = "error"]
+		  if [ "$fpu" = "error" ]
 		  then
-		    echo "Unknown target in --with-$which=$val" 1>&2
+		    echo "Unknown target in --with-fpu=$val" 1>&2
 		    exit 1
 		  fi
 		fi