diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-03 12:17:59 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-03 12:17:59 +0000 |
| commit | 73556f5f6c5d835df3baa9979de74da7bd85cd05 (patch) | |
| tree | ac76e75c45976914468f05d9d01c6dab44ff831c /gcc/config/m68k | |
| parent | 009b254c18c50184aadbc41673222104cec47838 (diff) | |
| download | gcc-73556f5f6c5d835df3baa9979de74da7bd85cd05.tar.gz | |
2011-01-03 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 168414
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@168419 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/m68k')
| -rw-r--r-- | gcc/config/m68k/linux.h | 2 | ||||
| -rw-r--r-- | gcc/config/m68k/m68kelf.h | 6 | ||||
| -rw-r--r-- | gcc/config/m68k/t-linux | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index be792f3f84f..9146024acbc 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (68k GNU/Linux with ELF)"); -/* Add %(asm_cpu_spec) to the svr4.h definition of ASM_SPEC. */ +/* Add %(asm_cpu_spec) to a generic definition of ASM_SPEC. */ #undef ASM_SPEC #define ASM_SPEC "%(asm_cpu_spec) %(asm_pcrel_spec) \ %{Qy:} %{!Qn:-Qy} %{Ym,*} %{Yd,*}" diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h index cdfac9e8fed..d3fc41a4e49 100644 --- a/gcc/config/m68k/m68kelf.h +++ b/gcc/config/m68k/m68kelf.h @@ -1,7 +1,7 @@ /* m68kelf support, derived from m68kv4.h */ /* Target definitions for GNU compiler for mc680x0 running System V.4 - Copyright (C) 1991, 1993, 2000, 2002, 2003, 2004, 2007 + Copyright (C) 1991, 1993, 2000, 2002, 2003, 2004, 2007, 2010 Free Software Foundation, Inc. Written by Ron Guilmette (rfg@netcom.com) and Fred Fish (fnf@cygnus.com). @@ -126,8 +126,8 @@ do { \ #define JUMP_TABLES_IN_TEXT_SECTION 1 -/* Override the definition in svr4.h. In m68k svr4, using swbeg is the - standard way to do switch table. */ +/* In m68k svr4, using swbeg is the standard way to do switch + table. */ #undef ASM_OUTPUT_BEFORE_CASE_LABEL #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE) \ fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1)); diff --git a/gcc/config/m68k/t-linux b/gcc/config/m68k/t-linux index 8dd5112a55c..7af40dafce9 100644 --- a/gcc/config/m68k/t-linux +++ b/gcc/config/m68k/t-linux @@ -18,8 +18,8 @@ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o -# Only include multilibs for CPUs with an MMU. -M68K_MLIB_CPU += && match(FLAGS, "FL_MMU") +# Only include multilibs for 680x0 CPUs with an MMU. +M68K_MLIB_CPU += && (CPU ~ "^m680") && (FLAGS ~ "FL_MMU") # This rule uses MULTILIB_MATCHES to generate a definition of # SYSROOT_SUFFIX_SPEC. |