summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2016-04-08 17:17:58 +0200
committerLinaro Code Review <review@review.linaro.org>2016-04-11 09:04:55 +0000
commit046bf329082ef9a1fef6652aceb2401addb086e8 (patch)
treea1e4a18e4fcddc7fa40e88840a14bab909e30c86
parent3dd818bc98c4e8f6d8ca68ebdb89b5533aac16e5 (diff)
downloadgcc-046bf329082ef9a1fef6652aceb2401addb086e8.tar.gz
gcc/
Backport from trunk r234419. 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. Change-Id: I994540e94b3d832f64096f3210df0e8136dc1c38
-rw-r--r--gcc/config/arm/driver-arm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc/config/arm/driver-arm.c b/gcc/config/arm/driver-arm.c
index 9d24a3fb378..6d68c2270ac 100644
--- 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:
{