[ARM] PR driver/70132: Avoid double fclose in driver-arm.c

	Backport from mainline
	2016-03-23  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR driver/70132
	* config/arm/driver-arm.c (host_detect_local_cpu): Reorder exit logic
	to not call fclose twice on file.

From-SVN: r236092

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0673d21d709950a4c8fac635c5240e50b956b7ce..b17c08416482c25ece1e52da147adb8dd0308e4e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-10  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       Backport from mainline
+       2016-03-23  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR driver/70132
+       * config/arm/driver-arm.c (host_detect_local_cpu): Reorder exit logic
+       to not call fclose twice on file.
+
 2016-05-10  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/config/arm/driver-arm.c b/gcc/config/arm/driver-arm.c
index 6d9c4174c967b48a00cfd6faca4b6b077816b370..ea5c265ba96623719988e51b9e520306bbb1c149 100644 (file)
--- a/gcc/config/arm/driver-arm.c
+++ b/gcc/config/arm/driver-arm.c
@@ -124,12 +124,11 @@ host_detect_local_cpu (int argc, const char **argv)
        }
     }
 
-  fclose (f);
-
-  if (val == NULL)
-    goto not_found;
-
-  return concat ("-m", argv[0], "=", val, NULL);
+  if (val)
+    {
+      fclose (f);
+      return concat ("-m", argv[0], "=", val, NULL);
+     }
 
 not_found:
   {