diff options
author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
---|---|---|
committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/common | |
parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/common')
-rw-r--r-- | gcc-4.9/gcc/common/config/msp430/msp430-common.c | 91 | ||||
-rw-r--r-- | gcc-4.9/gcc/common/config/nds32/nds32-common.c | 2 |
2 files changed, 92 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/common/config/msp430/msp430-common.c b/gcc-4.9/gcc/common/config/msp430/msp430-common.c new file mode 100644 index 000000000..fc2c1f27d --- /dev/null +++ b/gcc-4.9/gcc/common/config/msp430/msp430-common.c @@ -0,0 +1,91 @@ +/* Common hooks for Texas Instruments MSP430. + Copyright (C) 2014 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + GCC is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "diagnostic-core.h" +#include "tm.h" +#include "common/common-target.h" +#include "common/common-target-def.h" +#include "opts.h" +#include "flags.h" + +/* Handle -mcpu= and -mmcu= here. We want to ensure that only one + of these two options - the last specified on the command line - + is passed on to the msp430 backend. */ + +static bool +msp430_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED, + struct gcc_options *opts_set ATTRIBUTE_UNUSED, + const struct cl_decoded_option *decoded, + location_t loc ATTRIBUTE_UNUSED) +{ + switch (decoded->opt_index) + { + case OPT_mcpu_: + if (strcasecmp (decoded->arg, "msp430x") == 0 + || strcasecmp (decoded->arg, "msp430xv2") == 0 + || strcasecmp (decoded->arg, "430x") == 0 + || strcasecmp (decoded->arg, "430xv2") == 0) + { + target_cpu = "msp430x"; + target_mcu = NULL; + } + else if (strcasecmp (decoded->arg, "msp430") == 0 + || strcasecmp (decoded->arg, "430") == 0) + { + target_cpu = "msp430"; + target_mcu = NULL; + } + else + { + error ("unrecognised argument of -mcpu: %s", decoded->arg); + return false; + } + break; + + case OPT_mmcu_: + /* For backwards compatibility we recognise two generic MCU + 430X names. However we want to be able to generate special C + preprocessor defines for them, which is why we set target_mcu + to NULL. */ + if (strcasecmp (decoded->arg, "msp430") == 0) + { + target_cpu = "msp430"; + target_mcu = NULL; + } + else if (strcasecmp (decoded->arg, "msp430x") == 0 + || strcasecmp (decoded->arg, "msp430xv2") == 0) + { + target_cpu = "msp430x"; + target_mcu = NULL; + } + else + target_cpu = NULL; + break; + } + + return true; +} + +#undef TARGET_HANDLE_OPTION +#define TARGET_HANDLE_OPTION msp430_handle_option + +struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; diff --git a/gcc-4.9/gcc/common/config/nds32/nds32-common.c b/gcc-4.9/gcc/common/config/nds32/nds32-common.c index 7d9bf6704..6a2ef81a1 100644 --- a/gcc-4.9/gcc/common/config/nds32/nds32-common.c +++ b/gcc-4.9/gcc/common/config/nds32/nds32-common.c @@ -1,5 +1,5 @@ /* Common hooks of Andes NDS32 cpu for GNU compiler - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2013 Free Software Foundation, Inc. Contributed by Andes Technology Corporation. This file is part of GCC. |