diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2017-06-16 21:03:55 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@gcc.gnu.org> | 2017-06-16 21:03:55 +0000 |
| commit | a4af8a1046d3c77ee1152c9dad08329a0dd51f49 (patch) | |
| tree | 94c050ac9841ea92f8762f23761f5ed27b4a8085 | |
| parent | bf35d17a30c0a476b6abc82e0b029029c5599104 (diff) | |
| download | gcc-a4af8a1046d3c77ee1152c9dad08329a0dd51f49.zip gcc-a4af8a1046d3c77ee1152c9dad08329a0dd51f49.tar.gz gcc-a4af8a1046d3c77ee1152c9dad08329a0dd51f49.tar.bz2 | |
[arm] Force a CPU default in the config args defaults
Currently if the user does not specify a default CPU or architecture
the compiler provieds no default values in the spec defaults. We can
try to work from TARGET_CPU_DEFAULT but pulling that into the driver
is a bit crufty and doesn't really work well with the general
spec-processing model. A better way is to ensure that with_cpu is
always set appropirately during configure. To avoid problems with the
multilib fragment processing we defer this until after we have
processed any required fragments before selecting the default.
* config.gcc (arm*-*-*): Ensure both target_cpu_cname and with_cpu
are set after handling multilib fragments. Set target_cpu_default2
from with_cpu.
From-SVN: r249291
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config.gcc | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3299cde..2cb85e8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2017-06-16 Richard Earnshaw <rearnsha@arm.com> + * config.gcc (arm*-*-*): Ensure both target_cpu_cname and with_cpu + are set after handling multilib fragments. Set target_cpu_default2 + from with_cpu. + +2017-06-16 Richard Earnshaw <rearnsha@arm.com> + * config.gcc (arm*-*-fucshia*): Set target_cpu_cname to the real cpu name. (arm*-*-*): Set target_cpu_default2 to a quoted string. diff --git a/gcc/config.gcc b/gcc/config.gcc index 620a5b2..f3923fd 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -3861,6 +3861,8 @@ case "${target}" in TM_MULTILIB_CONFIG="$with_multilib_list" fi fi + target_cpu_cname=${target_cpu_cname:-arm6} + with_cpu=${with_cpu:-$target_cpu_cname} ;; fr*-*-*linux*) @@ -4494,11 +4496,12 @@ case ${target} in ;; arm*-*-*) - if test x$target_cpu_cname = x + if test x$with_cpu = x then - target_cpu_default2="\\\"arm6\\\"" + echo "Don't know the target cpu" 1>&2 + exit 1 else - target_cpu_default2="\\\"$target_cpu_cname\\\"" + target_cpu_default2="\\\"$with_cpu\\\"" fi ;; |