aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Greenhalgh <james.greenhalgh@arm.com>2014-01-27 15:51:42 +0000
committerJames Greenhalgh <jgreenhalgh@gcc.gnu.org>2014-01-27 15:51:42 +0000
commit84e90123e6f43db35b07d8081fcdcb7fd08cdeda (patch)
tree16cc4008e0df9fe3c15c38bf8dc5070785adbaf9
parentccc2e73ce793f729f0bd717b67f51ca197fc03b9 (diff)
downloadgcc-84e90123e6f43db35b07d8081fcdcb7fd08cdeda.zip
gcc-84e90123e6f43db35b07d8081fcdcb7fd08cdeda.tar.gz
gcc-84e90123e6f43db35b07d8081fcdcb7fd08cdeda.tar.bz2
[ARM] fix big.LITTLE spec rewriting
gcc/ * common/config/arm/arm-common.c (arm_rewrite_mcpu): Handle multiple names. * config/arm/arm.h (BIG_LITTLE_SPEC): Do not discard mcpu switches. From-SVN: r207133
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/common/config/arm/arm-common.c8
-rw-r--r--gcc/config/arm/arm.h2
3 files changed, 13 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41dfda3..8405b2e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
2014-01-27 James Greenhalgh <james.greenhalgh@arm.com>
+ * common/config/arm/arm-common.c
+ (arm_rewrite_mcpu): Handle multiple names.
+ * config/arm/arm.h
+ (BIG_LITTLE_SPEC): Do not discard mcpu switches.
+
+2014-01-27 James Greenhalgh <james.greenhalgh@arm.com>
+
* gimple-builder.h (create_gimple_tmp): Delete.
2014-01-27 Christian Bruel <christian.bruel@st.com>
diff --git a/gcc/common/config/arm/arm-common.c b/gcc/common/config/arm/arm-common.c
index 065de7d..205d82a 100644
--- a/gcc/common/config/arm/arm-common.c
+++ b/gcc/common/config/arm/arm-common.c
@@ -86,13 +86,15 @@ arm_rewrite_selected_cpu (const char *name)
/* Called by the driver to rewrite a name passed to the -mcpu
argument in preparation to be passed to the assembler. The
- name will be in ARGV[0], ARGC should always be 1. */
+ names passed from the command line will be in ARGV, we want
+ to use the right-most argument, which should be in
+ ARGV[ARGC - 1]. ARGC should always be greater than 0. */
const char *
arm_rewrite_mcpu (int argc, const char **argv)
{
- gcc_assert (argc == 1);
- return arm_rewrite_selected_cpu (argv[0]);
+ gcc_assert (argc);
+ return arm_rewrite_selected_cpu (argv[argc - 1]);
}
#undef ARM_CPU_NAME_LENGTH
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index b815488..bed056e 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2356,7 +2356,7 @@ extern int making_const_table;
#define MAX_LDM_STM_OPS 4
#define BIG_LITTLE_SPEC \
- " %{mcpu=*:%<mcpu=* -mcpu=%:rewrite_mcpu(%{mcpu=*:%*})}" \
+ " %{mcpu=*:-mcpu=%:rewrite_mcpu(%{mcpu=*:%*})}"
extern const char *arm_rewrite_mcpu (int argc, const char **argv);
#define BIG_LITTLE_CPU_SPEC_FUNCTIONS \