From ec0044e4362064b88d5d29e1ae84bb860e295cd6 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 13 May 2009 15:10:55 +0000 Subject: [PATCH] * config/m68k/t-uclinux (M68K_MLIB_CPU): Check for FL_UCLINUX. * config/m68k/m68k-devices.def: Add FL_UCLINUX to 68020 and 54455 multilibs. * config/m68k/m68k.h (FL_UCLINUX): Define. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147478 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/config/m68k/m68k-devices.def | 16 ++++++++-------- gcc/config/m68k/m68k.h | 1 + gcc/config/m68k/t-uclinux | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de750e8e076..f241238f671 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-05-13 Nathan Sidwell + + * config/m68k/t-uclinux (M68K_MLIB_CPU): Check for FL_UCLINUX. + * config/m68k/m68k-devices.def: Add FL_UCLINUX to 68020 and 54455 + multilibs. + * config/m68k/m68k.h (FL_UCLINUX): Define. + 2009-05-13 Jan Hubicka * options.c (gfc_post_options): -fwhole-program imply -fwhole-file. diff --git a/gcc/config/m68k/m68k-devices.def b/gcc/config/m68k/m68k-devices.def index b89e7213f3f..6f87ce07613 100644 --- a/gcc/config/m68k/m68k-devices.def +++ b/gcc/config/m68k/m68k-devices.def @@ -72,8 +72,8 @@ /* 680x0 series processors. */ M68K_DEVICE ("68000", m68000, "68000", "68000", 68000, isa_00, 0) M68K_DEVICE ("68010", m68010, "68010", "68000", 68010, isa_10, 0) -M68K_DEVICE ("68020", m68020, "68020", "68020", 68020, isa_20, FL_MMU) -M68K_DEVICE ("68030", m68030, "68030", "68020", 68030, isa_20, FL_MMU) +M68K_DEVICE ("68020", m68020, "68020", "68020", 68020, isa_20, FL_MMU | FL_UCLINUX) +M68K_DEVICE ("68030", m68030, "68030", "68020", 68030, isa_20, FL_MMU | FL_UCLINUX) M68K_DEVICE ("68040", m68040, "68040", "68040", 68040, isa_40, FL_MMU) M68K_DEVICE ("68060", m68060, "68060", "68060", 68060, isa_40, FL_MMU) M68K_DEVICE ("68302", m68302, "68302", "68000", 68000, isa_00, FL_MMU) @@ -158,12 +158,12 @@ M68K_DEVICE ("537x", mcf537x, "5373", "5329", cfv3, isa_aplus, FL_CF_HWD /* CFV4/CFV4e processors. */ M68K_DEVICE ("5407", mcf5407, "5407", "5407", cfv4, isa_b, FL_CF_MAC) -M68K_DEVICE ("54450", mcf54450, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) -M68K_DEVICE ("54451", mcf54451, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) -M68K_DEVICE ("54452", mcf54452, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) -M68K_DEVICE ("54453", mcf54453, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) -M68K_DEVICE ("54454", mcf54454, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) -M68K_DEVICE ("54455", mcf54455, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU) +M68K_DEVICE ("54450", mcf54450, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) +M68K_DEVICE ("54451", mcf54451, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) +M68K_DEVICE ("54452", mcf54452, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) +M68K_DEVICE ("54453", mcf54453, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) +M68K_DEVICE ("54454", mcf54454, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) +M68K_DEVICE ("54455", mcf54455, "54455", "54455", cfv4, isa_c, FL_CF_HWDIV | FL_CF_USP | FL_CF_EMAC | FL_MMU | FL_UCLINUX) M68K_DEVICE ("5470", mcf5470, "5475", "5475", cfv4e, isa_b, FL_CF_USP | FL_CF_EMAC | FL_CF_FPU | FL_MMU) M68K_DEVICE ("5471", mcf5471, "5475", "5475", cfv4e, isa_b, FL_CF_USP | FL_CF_EMAC | FL_CF_FPU | FL_MMU) M68K_DEVICE ("5472", mcf5472, "5475", "5475", cfv4e, isa_b, FL_CF_USP | FL_CF_EMAC | FL_CF_FPU | FL_MMU) diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index ec0b35bdc1b..a30cd47360c 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -232,6 +232,7 @@ along with GCC; see the file COPYING3. If not see #define FL_ISA_C (1 << 16) #define FL_FIDOA (1 << 17) #define FL_MMU 0 /* Used by multilib machinery. */ +#define FL_UCLINUX 0 /* Used by multilib machinery. */ #define TARGET_68010 ((m68k_cpu_flags & FL_ISA_68010) != 0) #define TARGET_68020 ((m68k_cpu_flags & FL_ISA_68020) != 0) diff --git a/gcc/config/m68k/t-uclinux b/gcc/config/m68k/t-uclinux index 15d68aa8dd6..e1711a3443e 100644 --- a/gcc/config/m68k/t-uclinux +++ b/gcc/config/m68k/t-uclinux @@ -19,8 +19,8 @@ # crti and crtn are provided by uClibc. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o -# Only include multilibs for the 68020 and for CPUs without an MMU. -M68K_MLIB_CPU += && (MLIB == "68020" || !match(FLAGS, "FL_MMU")) +# Include multilibs for CPUs without an MMU or with FL_UCLINUX +M68K_MLIB_CPU += && (!match(FLAGS, "FL_MMU") || match(FLAGS, "FL_UCLINUX")) # Add multilibs for execute-in-place and shared-library code. M68K_MLIB_OPTIONS += msep-data/mid-shared-library -- 2.11.0