mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 10:51:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

cris.h (ASM_SPEC, [...]): Check for mcpu not cpu.

Browse Source 
* 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.

From-SVN: r168808
This commit is contained in:
Joseph Myers 2011-01-14 18:51:46 +00:00 committed by Joseph Myers
parent e7f2f53750
commit a3010a69a8
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2011-01-14 Joseph Myers <joseph@codesourcery.com>
* 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.
2011-01-14 Joseph Myers <joseph@codesourcery.com>
* config/avr/avr.h (CPP_SPEC): Don't handle -posix.

12
gcc/config/cris/cris.h
View File

@ -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}\

20
gcc/config/cris/linux.h
View File

@ -1,5 +1,5 @@
/* Definitions for GCC. Part of the machine description for CRIS.
Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Axis Communications. Written by Hans-Peter Nilsson.
@ -56,21 +56,21 @@ along with GCC; see the file COPYING3. If not see
#if TARGET_CPU_DEFAULT == 32
# define CRIS_CPP_SUBTARGET_SPEC \
"%{pthread:-D_REENTRANT}\
%{!march=*:%{!cpu=*:-D__arch_v32 -D__CRIS_arch_version=32}}"
%{!march=*:%{!mcpu=*:-D__arch_v32 -D__CRIS_arch_version=32}}"
#else
# define CRIS_CPP_SUBTARGET_SPEC \
"%{pthread:-D_REENTRANT}\
%{!march=*:%{!cpu=*:-D__arch_v10 -D__CRIS_arch_version=10}}"
%{!march=*:%{!mcpu=*:-D__arch_v10 -D__CRIS_arch_version=10}}"
#endif
#undef CRIS_CC1_SUBTARGET_SPEC
#if TARGET_CPU_DEFAULT == 32
# define CRIS_CC1_SUBTARGET_SPEC \
"%{!march=*:%{!cpu=*:-march=v32}}"
"%{!march=*:%{!mcpu=*:-march=v32}}"
#define CRIS_SUBTARGET_DEFAULT_ARCH MASK_AVOID_GOTPLT
#else
# define CRIS_CC1_SUBTARGET_SPEC \
"%{!march=*:%{!cpu=*:-march=v10}}"
"%{!march=*:%{!mcpu=*:-march=v10}}"
#define CRIS_SUBTARGET_DEFAULT_ARCH 0
#endif
@ -78,13 +78,13 @@ along with GCC; see the file COPYING3. If not see
#if TARGET_CPU_DEFAULT == 32
# define CRIS_ASM_SUBTARGET_SPEC \
"--em=criself \
%{!march=*:%{!cpu=*:--march=v32}} \
%{!march=*:%{!mcpu=*:--march=v32}} \
%{!fleading-underscore:--no-underscore}\
%{fPIC|fpic|fPIE|fpie: --pic}"
#else
# define CRIS_ASM_SUBTARGET_SPEC \
"--em=criself \
%{!march=*:%{!cpu=*:--march=v10}} \
%{!march=*:%{!mcpu=*:--march=v10}} \
%{!fleading-underscore:--no-underscore}\
%{fPIC|fpic|fPIE|fpie: --pic}"
#endif
@ -105,15 +105,11 @@ along with GCC; see the file COPYING3. If not see
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
/* We need an -rpath-link to ld.so.1, and presumably to each directory
specified with -B. */
#undef CRIS_LINK_SUBTARGET_SPEC
#define CRIS_LINK_SUBTARGET_SPEC \
"-mcrislinux\
%{B*:-rpath-link %*}\
%{!nostdlib:-rpath-link ../sys-include/asm/../../lib%s}\
%{shared} %{static}\
%{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
%{symbolic:-Bdynamic} %{static:-Bstatic}\
%{!shared:%{!static:\
%{rdynamic:-export-dynamic}\
-dynamic-linker " LINUX_DYNAMIC_LINKER "}}\