[6/7] cgcc: extract add_specs_arch() from add_specs()

Commit Message

Luc Van Oostenryck Feb. 17, 2019, 3:31 p.m. UTC

---
 cgcc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Patch

diff --git a/cgcc b/cgcc
index d178e3bc3..170612b05 100755
--- a/cgcc
+++ b/cgcc
@@ -92,7 +92,7 @@  if ($gendeps) {
 
 if ($do_check) {
     if (!$has_specs) {
-	$check .= &add_specs ('host_arch_specs');
+	$check .= &add_specs_arch;
 	$check .= &add_specs ('host_os_specs');
     }
 
@@ -337,7 +337,12 @@  sub add_specs {
 	my $os = `uname -s`;
 	chomp $os;
 	return &add_specs (lc $os);
-    } elsif ($spec eq 'host_arch_specs') {
+    } else {
+	die "$0: invalid specs: $spec\n";
+    }
+}
+
+sub add_specs_arch {
 	my $gccmachine;
 	my $arch;
 
@@ -390,9 +395,8 @@  sub add_specs {
 	} elsif ($arch =~ /^(aarch64)$/i) {
 	    return &add_specs ('aarch64');
 	}
-    } else {
-	die "$0: invalid specs: $spec\n";
-    }
+
+	print "$0: unknown arch: $arch\n" if $verbose;
 }
 
 # -----------------------------------------------------------------------------