diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-14 18:51:46 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-14 18:51:46 +0000 |
| commit | 8fe30b376c8c230add8cdd31dddd53c18f36c40a (patch) | |
| tree | 158f5b6c33a52be2b8fe40e25602d56c76f100bd /gcc/config/cris/cris.h | |
| parent | d89fb5e4090e1d6d7f4a3dcb78ed4d9bb287befa (diff) | |
| download | gcc-8fe30b376c8c230add8cdd31dddd53c18f36c40a.tar.gz | |
* config/cris/cris.h (ASM_SPEC, CRIS_ASM_SUBTARGET_SPEC): Check
for mcpu not cpu.
* config/cris/linux.h (CRIS_CPP_SUBTARGET_SPEC,
CRIS_CC1_SUBTARGET_SPEC, CRIS_ASM_SUBTARGET_SPEC): Check for mcpu
not cpu.
(CRIS_LINK_SUBTARGET_SPEC): Don't generate -rpath-link options.
Don't handle -shlib.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/cris/cris.h')
| -rw-r--r-- | gcc/config/cris/cris.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 92ba88d54bc..0e69e694893 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -1,6 +1,6 @@ /* Definitions for GCC. Part of the machine description for CRIS. Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by Axis Communications. Written by Hans-Peter Nilsson. This file is part of GCC. @@ -193,12 +193,12 @@ extern int cris_cpu_version; #define ASM_SPEC \ MAYBE_AS_NO_MUL_BUG_ABORT \ "%(asm_subtarget)\ - %{march=*:%{cpu=*:%edo not specify both -march=... and -mcpu=...}}\ + %{march=*:%{mcpu=*:%edo not specify both -march=... and -mcpu=...}}\ %{march=v32:--march=v32} %{mcpu=v32:--march=v32}" /* For the cris-*-elf subtarget. */ #define CRIS_ASM_SUBTARGET_SPEC \ - "--em=criself %{!march=*:%{!cpu=*:" CRIS_DEFAULT_ASM_ARCH_OPTION "}}" + "--em=criself %{!march=*:%{!mcpu=*:" CRIS_DEFAULT_ASM_ARCH_OPTION "}}" /* FIXME: We should propagate the -melf option to make the criself "emulation" unless a linker script is provided (-T*), but I don't know @@ -207,10 +207,8 @@ extern int cris_cpu_version; time being. Note that -melf overrides -maout except that a.out-compiled libraries - are linked in (multilibbing). The somewhat cryptic -rpath-link pair is - to avoid *only* picking up the linux multilib subdir from the "-B./" - option during build, while still giving it preference. We'd need some - %s-variant that checked for existence of some specific file. */ + are linked in (multilibbing). We'd need some %s-variant that + checked for existence of some specific file. */ #undef LINK_SPEC #define LINK_SPEC \ "%{v:--verbose}\ |