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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234419 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a1eb03..f78ff93 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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-03-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/70354

diff --git a/gcc/config/arm/driver-arm.c b/gcc/config/arm/driver-arm.c
index 466743b..95dc9d5 100644 (file)
--- a/gcc/config/arm/driver-arm.c
+++ b/gcc/config/arm/driver-arm.c
@@ -128,12 +128,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:
   {