diff gcc/config/sh/sh.h @ 111:04ced10e8804

gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents f6334be47118
children 84e7813d76e9
line wrap: on
line diff
--- a/gcc/config/sh/sh.h	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/config/sh/sh.h	Fri Oct 27 22:46:09 2017 +0900
@@ -1,7 +1,5 @@
 /* Definitions of target machine for GNU compiler for Renesas / SuperH SH.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1993-2017 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain (sac@cygnus.com).
    Improved by Jim Wilson (wilson@cygnus.com).
 
@@ -26,77 +24,12 @@
 
 #include "config/vxworks-dummy.h"
 
-#define TARGET_VERSION \
-  fputs (" (Hitachi SH)", stderr);
-
 /* Unfortunately, insn-attrtab.c doesn't include insn-codes.h.  We can't
    include it here, because bconfig.h is also included by gencodes.c .  */
 /* ??? No longer true.  */
 extern int code_for_indirect_jump_scratch;
 
-#define TARGET_CPU_CPP_BUILTINS() \
-do { \
-  builtin_define ("__sh__"); \
-  builtin_assert ("cpu=sh"); \
-  builtin_assert ("machine=sh"); \
-  switch ((int) sh_cpu) \
-    { \
-    case PROCESSOR_SH1: \
-      builtin_define ("__sh1__"); \
-      break; \
-    case PROCESSOR_SH2: \
-      builtin_define ("__sh2__"); \
-      break; \
-    case PROCESSOR_SH2E: \
-      builtin_define ("__SH2E__"); \
-      break; \
-    case PROCESSOR_SH2A: \
-      builtin_define ("__SH2A__"); \
-      builtin_define (TARGET_SH2A_DOUBLE \
-		      ? (TARGET_FPU_SINGLE ? "__SH2A_SINGLE__" : "__SH2A_DOUBLE__") \
-		      : TARGET_FPU_ANY ? "__SH2A_SINGLE_ONLY__" \
-		      : "__SH2A_NOFPU__"); \
-      break; \
-    case PROCESSOR_SH3: \
-      builtin_define ("__sh3__"); \
-      builtin_define ("__SH3__"); \
-      if (TARGET_HARD_SH4) \
-	builtin_define ("__SH4_NOFPU__"); \
-      break; \
-    case PROCESSOR_SH3E: \
-      builtin_define (TARGET_HARD_SH4 ? "__SH4_SINGLE_ONLY__" : "__SH3E__"); \
-      break; \
-    case PROCESSOR_SH4: \
-      builtin_define (TARGET_FPU_SINGLE ? "__SH4_SINGLE__" : "__SH4__"); \
-      break; \
-    case PROCESSOR_SH4A: \
-      builtin_define ("__SH4A__"); \
-      builtin_define (TARGET_SH4 \
-		      ? (TARGET_FPU_SINGLE ? "__SH4_SINGLE__" : "__SH4__") \
-		      : TARGET_FPU_ANY ? "__SH4_SINGLE_ONLY__" \
-		      : "__SH4_NOFPU__"); \
-      break; \
-    case PROCESSOR_SH5: \
-      { \
-	builtin_define_with_value ("__SH5__", \
-				   TARGET_SHMEDIA64 ? "64" : "32", 0); \
-	builtin_define_with_value ("__SHMEDIA__", \
-				   TARGET_SHMEDIA ? "1" : "0", 0); \
-	if (! TARGET_FPU_DOUBLE) \
-	  builtin_define ("__SH4_NOFPU__"); \
-      } \
-    } \
-  if (TARGET_FPU_ANY) \
-    builtin_define ("__SH_FPU_ANY__"); \
-  if (TARGET_FPU_DOUBLE) \
-    builtin_define ("__SH_FPU_DOUBLE__"); \
-  if (TARGET_HITACHI) \
-    builtin_define ("__HITACHI__"); \
-  if (TARGET_FMOVD) \
-    builtin_define ("__FMOVD_ENABLED__"); \
-  builtin_define (TARGET_LITTLE_ENDIAN \
-		  ? "__LITTLE_ENDIAN__" : "__BIG_ENDIAN__"); \
-} while (0)
+#define TARGET_CPU_CPP_BUILTINS() sh_cpu_cpp_builtins (pfile)
 
 /* Value should be nonzero if functions must have frame pointers.
    Zero means the frame pointer need not be set up (and parms may be accessed
@@ -123,56 +56,23 @@
 /* Nonzero if we should generate code using type 3E insns.  */
 #define TARGET_SH3E (TARGET_SH3 && TARGET_SH_E)
 
-/* Nonzero if the cache line size is 32.  */
-#define TARGET_CACHE32 (TARGET_HARD_SH4 || TARGET_SH5)
-
 /* Nonzero if we schedule for a superscalar implementation.  */
-#define TARGET_SUPERSCALAR TARGET_HARD_SH4
-
-/* Nonzero if the target has separate instruction and data caches.  */
-#define TARGET_HARVARD (TARGET_HARD_SH4 || TARGET_SH5)
+#define TARGET_SUPERSCALAR (TARGET_HARD_SH4 || TARGET_SH2A)
 
 /* Nonzero if a double-precision FPU is available.  */
-#define TARGET_FPU_DOUBLE \
-  ((target_flags & MASK_SH4) != 0 || TARGET_SH2A_DOUBLE)
+#define TARGET_FPU_DOUBLE (TARGET_SH4 || TARGET_SH2A_DOUBLE)
 
 /* Nonzero if an FPU is available.  */
 #define TARGET_FPU_ANY (TARGET_SH2E || TARGET_FPU_DOUBLE)
 
-/* Nonzero if we should generate code using type 4 insns.  */
-#undef TARGET_SH4
-#define TARGET_SH4 ((target_flags & MASK_SH4) != 0 && TARGET_SH1)
-
-/* Nonzero if we're generating code for the common subset of
-   instructions present on both SH4a and SH4al-dsp.  */
-#define TARGET_SH4A_ARCH TARGET_SH4A
-
 /* Nonzero if we're generating code for SH4a, unless the use of the
    FPU is disabled (which makes it compatible with SH4al-dsp).  */
-#define TARGET_SH4A_FP (TARGET_SH4A_ARCH && TARGET_FPU_ANY)
-
-/* Nonzero if we should generate code using the SHcompact instruction
-   set and 32-bit ABI.  */
-#define TARGET_SHCOMPACT (TARGET_SH5 && TARGET_SH1)
-
-/* Nonzero if we should generate code using the SHmedia instruction
-   set and ABI.  */
-#define TARGET_SHMEDIA (TARGET_SH5 && ! TARGET_SH1)
+#define TARGET_SH4A_FP (TARGET_SH4A && TARGET_FPU_ANY)
 
-/* Nonzero if we should generate code using the SHmedia ISA and 32-bit
-   ABI.  */
-#define TARGET_SHMEDIA32 (TARGET_SH5 && ! TARGET_SH1 && TARGET_SH_E)
-
-/* Nonzero if we should generate code using the SHmedia ISA and 64-bit
-   ABI.  */
-#define TARGET_SHMEDIA64 (TARGET_SH5 && ! TARGET_SH1 && ! TARGET_SH_E)
-
-/* Nonzero if we should generate code using SHmedia FPU instructions.  */
-#define TARGET_SHMEDIA_FPU (TARGET_SHMEDIA && TARGET_FPU_DOUBLE)
 
 /* This is not used by the SH2E calling convention  */
 #define TARGET_VARARGS_PRETEND_ARGS(FUN_DECL) \
-  (TARGET_SH1 && ! TARGET_SH2E && ! TARGET_SH5 \
+  (! TARGET_SH2E \
    && ! (TARGET_HITACHI || sh_attr_renesas_p (FUN_DECL)))
 
 #ifndef TARGET_CPU_DEFAULT
@@ -185,53 +85,36 @@
 #define SUPPORT_SH2A_SINGLE 1
 #endif
 
-#define TARGET_DIVIDE_INV \
-  (sh_div_strategy == SH_DIV_INV || sh_div_strategy == SH_DIV_INV_MINLAT \
-   || sh_div_strategy == SH_DIV_INV20U || sh_div_strategy == SH_DIV_INV20L \
-   || sh_div_strategy == SH_DIV_INV_CALL \
-   || sh_div_strategy == SH_DIV_INV_CALL2 || sh_div_strategy == SH_DIV_INV_FP)
-#define TARGET_DIVIDE_FP (sh_div_strategy == SH_DIV_FP)
-#define TARGET_DIVIDE_INV_FP (sh_div_strategy == SH_DIV_INV_FP)
-#define TARGET_DIVIDE_CALL2 (sh_div_strategy == SH_DIV_CALL2)
-#define TARGET_DIVIDE_INV_MINLAT (sh_div_strategy == SH_DIV_INV_MINLAT)
-#define TARGET_DIVIDE_INV20U (sh_div_strategy == SH_DIV_INV20U)
-#define TARGET_DIVIDE_INV20L (sh_div_strategy == SH_DIV_INV20L)
-#define TARGET_DIVIDE_INV_CALL (sh_div_strategy == SH_DIV_INV_CALL)
-#define TARGET_DIVIDE_INV_CALL2 (sh_div_strategy == SH_DIV_INV_CALL2)
 #define TARGET_DIVIDE_CALL_DIV1 (sh_div_strategy == SH_DIV_CALL_DIV1)
 #define TARGET_DIVIDE_CALL_FP (sh_div_strategy == SH_DIV_CALL_FP)
 #define TARGET_DIVIDE_CALL_TABLE (sh_div_strategy == SH_DIV_CALL_TABLE)
 
-#define SELECT_SH1               (MASK_SH1)
-#define SELECT_SH2               (MASK_SH2 | SELECT_SH1)
-#define SELECT_SH2E              (MASK_SH_E | MASK_SH2 | MASK_SH1 \
+#define SELECT_SH1		 (MASK_SH1)
+#define SELECT_SH2		 (MASK_SH2 | SELECT_SH1)
+#define SELECT_SH2E		 (MASK_SH_E | MASK_SH2 | MASK_SH1 \
 				  | MASK_FPU_SINGLE)
-#define SELECT_SH2A              (MASK_SH_E | MASK_HARD_SH2A \
+#define SELECT_SH2A		 (MASK_SH_E | MASK_HARD_SH2A \
 				  | MASK_HARD_SH2A_DOUBLE \
 				  | MASK_SH2 | MASK_SH1)
-#define SELECT_SH2A_NOFPU        (MASK_HARD_SH2A | MASK_SH2 | MASK_SH1)
+#define SELECT_SH2A_NOFPU	 (MASK_HARD_SH2A | MASK_SH2 | MASK_SH1)
 #define SELECT_SH2A_SINGLE_ONLY  (MASK_SH_E | MASK_HARD_SH2A | MASK_SH2 \
-				  | MASK_SH1 | MASK_FPU_SINGLE)
-#define SELECT_SH2A_SINGLE       (MASK_SH_E | MASK_HARD_SH2A \
+				  | MASK_SH1 | MASK_FPU_SINGLE \
+				  | MASK_FPU_SINGLE_ONLY)
+#define SELECT_SH2A_SINGLE	 (MASK_SH_E | MASK_HARD_SH2A \
 				  | MASK_FPU_SINGLE | MASK_HARD_SH2A_DOUBLE \
 				  | MASK_SH2 | MASK_SH1)
-#define SELECT_SH3               (MASK_SH3 | SELECT_SH2)
-#define SELECT_SH3E              (MASK_SH_E | MASK_FPU_SINGLE | SELECT_SH3)
-#define SELECT_SH4_NOFPU         (MASK_HARD_SH4 | SELECT_SH3)
-#define SELECT_SH4_SINGLE_ONLY   (MASK_HARD_SH4 | SELECT_SH3E)
-#define SELECT_SH4               (MASK_SH4 | MASK_SH_E | MASK_HARD_SH4 \
+#define SELECT_SH3		 (MASK_SH3 | SELECT_SH2)
+#define SELECT_SH3E		 (MASK_SH_E | MASK_FPU_SINGLE | SELECT_SH3)
+#define SELECT_SH4_NOFPU	 (MASK_HARD_SH4 | SELECT_SH3)
+#define SELECT_SH4_SINGLE_ONLY	 (MASK_HARD_SH4 | SELECT_SH3E \
+				  | MASK_FPU_SINGLE_ONLY)
+#define SELECT_SH4		 (MASK_SH4 | MASK_SH_E | MASK_HARD_SH4 \
 				  | SELECT_SH3)
-#define SELECT_SH4_SINGLE        (MASK_FPU_SINGLE | SELECT_SH4)
-#define SELECT_SH4A_NOFPU        (MASK_SH4A | SELECT_SH4_NOFPU)
+#define SELECT_SH4_SINGLE	 (MASK_FPU_SINGLE | SELECT_SH4)
+#define SELECT_SH4A_NOFPU	 (MASK_SH4A | SELECT_SH4_NOFPU)
 #define SELECT_SH4A_SINGLE_ONLY  (MASK_SH4A | SELECT_SH4_SINGLE_ONLY)
-#define SELECT_SH4A              (MASK_SH4A | SELECT_SH4)
-#define SELECT_SH4A_SINGLE       (MASK_SH4A | SELECT_SH4_SINGLE)
-#define SELECT_SH5_64MEDIA       (MASK_SH5 | MASK_SH4)
-#define SELECT_SH5_64MEDIA_NOFPU (MASK_SH5)
-#define SELECT_SH5_32MEDIA       (MASK_SH5 | MASK_SH4 | MASK_SH_E)
-#define SELECT_SH5_32MEDIA_NOFPU (MASK_SH5 | MASK_SH_E)
-#define SELECT_SH5_COMPACT       (MASK_SH5 | MASK_SH4 | SELECT_SH3E)
-#define SELECT_SH5_COMPACT_NOFPU (MASK_SH5 | SELECT_SH3)
+#define SELECT_SH4A		 (MASK_SH4A | SELECT_SH4)
+#define SELECT_SH4A_SINGLE	 (MASK_SH4A | SELECT_SH4_SINGLE)
 
 #if SUPPORT_SH1
 #define SUPPORT_SH2 1
@@ -267,25 +150,11 @@
 #define SUPPORT_SH4A_SINGLE 1
 #endif
 
-#if SUPPORT_SH5_COMPAT
-#define SUPPORT_SH5_32MEDIA 1
-#endif
-
-#if SUPPORT_SH5_COMPACT_NOFPU
-#define SUPPORT_SH5_32MEDIA_NOFPU 1
-#endif
-
-#define SUPPORT_ANY_SH5_32MEDIA \
-  (SUPPORT_SH5_32MEDIA || SUPPORT_SH5_32MEDIA_NOFPU)
-#define SUPPORT_ANY_SH5_64MEDIA \
-  (SUPPORT_SH5_64MEDIA || SUPPORT_SH5_64MEDIA_NOFPU)
-#define SUPPORT_ANY_SH5 \
-  (SUPPORT_ANY_SH5_32MEDIA || SUPPORT_ANY_SH5_64MEDIA)
-
 /* Reset all target-selection flags.  */
 #define MASK_ARCH (MASK_SH1 | MASK_SH2 | MASK_SH3 | MASK_SH_E | MASK_SH4 \
 		   | MASK_HARD_SH2A | MASK_HARD_SH2A_DOUBLE | MASK_SH4A \
-		   | MASK_HARD_SH4 | MASK_FPU_SINGLE | MASK_SH5)
+		   | MASK_HARD_SH4 | MASK_FPU_SINGLE \
+		   | MASK_FPU_SINGLE_ONLY)
 
 /* This defaults us to big-endian.  */
 #ifndef TARGET_ENDIAN_DEFAULT
@@ -293,7 +162,7 @@
 #endif
 
 #ifndef TARGET_OPT_DEFAULT
-#define TARGET_OPT_DEFAULT  MASK_ADJUST_UNROLL
+#define TARGET_OPT_DEFAULT  0
 #endif
 
 #define TARGET_DEFAULT \
@@ -332,22 +201,35 @@
   SUBTARGET_EXTRA_SPECS
 
 #if TARGET_CPU_DEFAULT & MASK_HARD_SH4
-#define SUBTARGET_ASM_RELAX_SPEC "%{!m1:%{!m2:%{!m3*:%{!m5*:-isa=sh4-up}}}}"
+#define SUBTARGET_ASM_RELAX_SPEC "%{!m1:%{!m2:%{!m3*:-isa=sh4-up}}}"
 #else
 #define SUBTARGET_ASM_RELAX_SPEC "%{m4*:-isa=sh4-up}"
 #endif
 
+/* Define which ISA type to pass to the assembler.
+   For SH4 we pass SH4A to allow using some instructions that are available
+   on some SH4 variants, but officially are part of the SH4A ISA.  */
 #define SH_ASM_SPEC \
- "%(subtarget_asm_endian_spec) %{mrelax:-relax %(subtarget_asm_relax_spec)}\
-%(subtarget_asm_isa_spec) %(subtarget_asm_spec)\
+ "%(subtarget_asm_endian_spec) %{mrelax:-relax %(subtarget_asm_relax_spec)} \
+%(subtarget_asm_isa_spec) %(subtarget_asm_spec) \
+%{m1:--isa=sh} \
+%{m2:--isa=sh2} \
+%{m2e:--isa=sh2e} \
+%{m3:--isa=sh3} \
+%{m3e:--isa=sh3e} \
+%{m4:--isa=sh4a} \
+%{m4-single:--isa=sh4a} \
+%{m4-single-only:--isa=sh4a} \
+%{m4-nofpu:--isa=sh4a-nofpu} \
+%{m4a:--isa=sh4a} \
+%{m4a-single:--isa=sh4a} \
+%{m4a-single-only:--isa=sh4a} \
+%{m4a-nofpu:--isa=sh4a-nofpu} \
 %{m2a:--isa=sh2a} \
 %{m2a-single:--isa=sh2a} \
 %{m2a-single-only:--isa=sh2a} \
 %{m2a-nofpu:--isa=sh2a-nofpu} \
-%{m5-compact*:--isa=SHcompact} \
-%{m5-32media*:--isa=SHmedia --abi=32} \
-%{m5-64media*:--isa=SHmedia --abi=64} \
-%{m4al:-dsp} %{mcut2-workaround:-cut2-workaround}"
+%{m4al:-dsp}"
 
 #define ASM_SPEC SH_ASM_SPEC
 
@@ -363,9 +245,9 @@
 /* Strict nofpu means that the compiler should tell the assembler
    to reject FPU instructions. E.g. from ASM inserts.  */
 #if TARGET_CPU_DEFAULT & MASK_HARD_SH4 && !(TARGET_CPU_DEFAULT & MASK_SH_E)
-#define SUBTARGET_ASM_ISA_SPEC "%{!m1:%{!m2:%{!m3*:%{m4-nofpu|!m4*:%{!m5:-isa=sh4-nofpu}}}}}"
+#define SUBTARGET_ASM_ISA_SPEC "%{!m1:%{!m2:%{!m3*:%{m4-nofpu|!m4*:-isa=sh4-nofpu}}}}"
 #else
-/* If there were an -isa option for sh5-nofpu then it would also go here. */
+
 #define SUBTARGET_ASM_ISA_SPEC \
  "%{m4-nofpu:-isa=sh4-nofpu} " ASM_ISA_DEFAULT_SPEC
 #endif
@@ -374,7 +256,7 @@
 #endif
 
 #ifndef SUBTARGET_ASM_SPEC
-#define SUBTARGET_ASM_SPEC ""
+#define SUBTARGET_ASM_SPEC "%{mfdpic:--fdpic}"
 #endif
 
 #if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN
@@ -383,26 +265,10 @@
 #define LINK_EMUL_PREFIX "sh%{ml:l}"
 #endif
 
-#if TARGET_CPU_DEFAULT & MASK_SH5
-#if TARGET_CPU_DEFAULT & MASK_SH_E
-#define LINK_DEFAULT_CPU_EMUL "32"
-#if TARGET_CPU_DEFAULT & MASK_SH1
-#define ASM_ISA_SPEC_DEFAULT "--isa=SHcompact"
-#else
-#define ASM_ISA_SPEC_DEFAULT "--isa=SHmedia --abi=32"
-#endif /* MASK_SH1 */
-#else /* !MASK_SH_E */
-#define LINK_DEFAULT_CPU_EMUL "64"
-#define ASM_ISA_SPEC_DEFAULT "--isa=SHmedia --abi=64"
-#endif /* MASK_SH_E */
-#define ASM_ISA_DEFAULT_SPEC \
-" %{!m1:%{!m2*:%{!m3*:%{!m4*:%{!m5*:" ASM_ISA_SPEC_DEFAULT "}}}}}"
-#else /* !MASK_SH5 */
 #define LINK_DEFAULT_CPU_EMUL ""
 #define ASM_ISA_DEFAULT_SPEC ""
-#endif /* MASK_SH5 */
 
-#define SUBTARGET_LINK_EMUL_SUFFIX ""
+#define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd}"
 #define SUBTARGET_LINK_SPEC ""
 
 /* Go via SH_LINK_SPEC to avoid code replication.  */
@@ -410,9 +276,7 @@
 
 #define SH_LINK_SPEC "\
 -m %(link_emul_prefix)\
-%{m5-compact*|m5-32media*:32}\
-%{m5-64media*:64}\
-%{!m1:%{!m2:%{!m3*:%{!m4*:%{!m5*:%(link_default_cpu_emul)}}}}}\
+%{!m1:%{!m2:%{!m3*:%{!m4*:%(link_default_cpu_emul)}}}}\
 %(subtarget_link_emul_suffix) \
 %{mrelax:-relax} %(subtarget_link_spec)"
 
@@ -420,24 +284,40 @@
 #define SH_DIV_STR_FOR_SIZE "call"
 #endif
 
-#define DRIVER_SELF_SPECS "%{m2a:%{ml:%eSH2a does not support little-endian}}"
+/* SH2A does not support little-endian.  Catch such combinations
+   taking into account the default configuration.  */
+#if TARGET_ENDIAN_DEFAULT == MASK_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN_OPTION "%{ml:"
+#else
+#define IS_LITTLE_ENDIAN_OPTION "%{!mb:"
+#endif
+ 
+#if TARGET_CPU_DEFAULT & MASK_HARD_SH2A
+#define UNSUPPORTED_SH2A IS_LITTLE_ENDIAN_OPTION \
+"%{m2a*|!m1:%{!m2*:%{!m3*:%{!m4*:%eSH2a does not support little-endian}}}}}"
+#else
+#define UNSUPPORTED_SH2A IS_LITTLE_ENDIAN_OPTION \
+"%{m2a*:%eSH2a does not support little-endian}}"
+#endif
+
+#ifdef FDPIC_DEFAULT
+#define FDPIC_SELF_SPECS "%{!mno-fdpic:-mfdpic}"
+#else
+#define FDPIC_SELF_SPECS
+#endif
+
+#undef DRIVER_SELF_SPECS
+#define DRIVER_SELF_SPECS UNSUPPORTED_SH2A SUBTARGET_DRIVER_SELF_SPECS \
+  FDPIC_SELF_SPECS
+
+#undef SUBTARGET_DRIVER_SELF_SPECS
+#define SUBTARGET_DRIVER_SELF_SPECS
 
 #define ASSEMBLER_DIALECT assembler_dialect
 
 extern int assembler_dialect;
 
 enum sh_divide_strategy_e {
-  /* SH5 strategies.  */
-  SH_DIV_CALL,
-  SH_DIV_CALL2,
-  SH_DIV_FP, /* We could do this also for SH4.  */
-  SH_DIV_INV,
-  SH_DIV_INV_MINLAT,
-  SH_DIV_INV20U,
-  SH_DIV_INV20L,
-  SH_DIV_INV_CALL,
-  SH_DIV_INV_CALL2,
-  SH_DIV_INV_FP,
   /* SH1 .. SH4 strategies.  Because of the small number of registers
      available, the compiler uses knowledge of the actual set of registers
      being clobbered by the different functions called.  */
@@ -450,25 +330,86 @@
 extern enum sh_divide_strategy_e sh_div_strategy;
 
 #ifndef SH_DIV_STRATEGY_DEFAULT
-#define SH_DIV_STRATEGY_DEFAULT SH_DIV_CALL
+#define SH_DIV_STRATEGY_DEFAULT SH_DIV_CALL_DIV1
 #endif
 
+#ifdef __cplusplus
+
+/* Atomic model.  */
+struct sh_atomic_model
+{
+  enum enum_type
+  {
+    none = 0,
+    soft_gusa,
+    hard_llcs,
+    soft_tcb,
+    soft_imask,
+
+    num_models
+  };
+
+  /*  If strict is set, disallow mixing of different models, as it would
+      happen on SH4A.  */
+  bool strict;
+  enum_type type;
+
+  /* Name string as it was specified on the command line.  */
+  const char* name;
+
+  /* Name string as it is used in C/C++ defines.  */
+  const char* cdef_name;
+
+  /* GBR offset variable for TCB model.  */
+  int tcb_gbr_offset;
+};
+
+extern const sh_atomic_model& selected_atomic_model (void);
+
+/* Shortcuts to check the currently selected atomic model.  */
+#define TARGET_ATOMIC_ANY \
+  (selected_atomic_model ().type != sh_atomic_model::none)
+
+#define TARGET_ATOMIC_STRICT \
+  (selected_atomic_model ().strict)
+
+#define TARGET_ATOMIC_SOFT_GUSA \
+  (selected_atomic_model ().type == sh_atomic_model::soft_gusa)
+
+#define TARGET_ATOMIC_HARD_LLCS \
+  (selected_atomic_model ().type == sh_atomic_model::hard_llcs)
+
+#define TARGET_ATOMIC_SOFT_TCB \
+  (selected_atomic_model ().type == sh_atomic_model::soft_tcb)
+
+#define TARGET_ATOMIC_SOFT_TCB_GBR_OFFSET_RTX \
+  GEN_INT (selected_atomic_model ().tcb_gbr_offset)
+
+#define TARGET_ATOMIC_SOFT_IMASK \
+  (selected_atomic_model ().type == sh_atomic_model::soft_imask)
+
+#endif // __cplusplus
+
 #define SUBTARGET_OVERRIDE_OPTIONS (void) 0
 
 
 /* Target machine storage layout.  */
 
+#define TARGET_BIG_ENDIAN (!TARGET_LITTLE_ENDIAN)
+
+#define SH_REG_MSW_OFFSET (TARGET_LITTLE_ENDIAN ? 1 : 0)
+#define SH_REG_LSW_OFFSET (TARGET_LITTLE_ENDIAN ? 0 : 1)
+
 /* Define this if most significant bit is lowest numbered
    in instructions that operate on numbered bit-fields.  */
-
 #define BITS_BIG_ENDIAN  0
 
 /* Define this if most significant byte of a word is the lowest numbered.  */
-#define BYTES_BIG_ENDIAN (TARGET_LITTLE_ENDIAN == 0)
+#define BYTES_BIG_ENDIAN TARGET_BIG_ENDIAN
 
 /* Define this if most significant word of a multiword number is the lowest
    numbered.  */
-#define WORDS_BIG_ENDIAN (TARGET_LITTLE_ENDIAN == 0)
+#define WORDS_BIG_ENDIAN TARGET_BIG_ENDIAN
 
 #define MAX_BITS_PER_WORD 64
 
@@ -477,7 +418,7 @@
 #define INT_TYPE_SIZE 32
 
 /* Width in bits of a `long'.  */
-#define LONG_TYPE_SIZE (TARGET_SHMEDIA64 ? 64 : 32)
+#define LONG_TYPE_SIZE (32)
 
 /* Width in bits of a `long long'.  */
 #define LONG_LONG_TYPE_SIZE 64
@@ -486,22 +427,19 @@
 #define LONG_DOUBLE_TYPE_SIZE 64
 
 /* Width of a word, in units (bytes).  */
-#define UNITS_PER_WORD	(TARGET_SHMEDIA ? 8 : 4)
+#define UNITS_PER_WORD	(4)
 #define MIN_UNITS_PER_WORD 4
 
 /* Scaling factor for Dwarf data offsets for CFI information.
-   The dwarf2out.c default would use -UNITS_PER_WORD, which is -8 for
-   SHmedia; however, since we do partial register saves for the registers
-   visible to SHcompact, and for target registers for SHMEDIA32, we have
-   to allow saves that are only 4-byte aligned.  */
+   The dwarf2out.c default would use -UNITS_PER_WORD.  */
 #define DWARF_CIE_DATA_ALIGNMENT -4
 
 /* Width in bits of a pointer.
    See also the macro `Pmode' defined below.  */
-#define POINTER_SIZE  (TARGET_SHMEDIA64 ? 64 : 32)
+#define POINTER_SIZE  (32)
 
 /* Allocation boundary (in *bits*) for storing arguments in argument list.  */
-#define PARM_BOUNDARY  	(TARGET_SH5 ? 64 : 32)
+#define PARM_BOUNDARY  	(32)
 
 /* Boundary (in *bits*) on which stack pointer should be aligned.  */
 #define STACK_BOUNDARY  BIGGEST_ALIGNMENT
@@ -509,17 +447,11 @@
 /* The log (base 2) of the cache line size, in bytes.  Processors prior to
    SH2 have no actual cache, but they fetch code in chunks of 4 bytes.
    The SH2/3 have 16 byte cache lines, and the SH4 has a 32 byte cache line */
-#define CACHE_LOG (TARGET_CACHE32 ? 5 : TARGET_SH2 ? 4 : 2)
+#define CACHE_LOG (TARGET_HARD_SH4 ? 5 : TARGET_SH2 ? 4 : 2)
 
 /* ABI given & required minimum allocation boundary (in *bits*) for the
    code of a function.  */
-#define FUNCTION_BOUNDARY (16 << TARGET_SHMEDIA)
-
-/* On SH5, the lowest bit is used to indicate SHmedia functions, so
-   the vbit must go into the delta field of
-   pointers-to-member-functions.  */
-#define TARGET_PTRMEMFUNC_VBIT_LOCATION \
-  (TARGET_SH5 ? ptrmemfunc_vbit_in_delta : ptrmemfunc_vbit_in_pfn)
+#define FUNCTION_BOUNDARY (16)
 
 /* Alignment of field after `int : 0' in a structure.  */
 #define EMPTY_FIELD_BOUNDARY  32
@@ -528,19 +460,11 @@
 #define BIGGEST_ALIGNMENT  (TARGET_ALIGN_DOUBLE ? 64 : 32)
 
 /* The best alignment to use in cases where we have a choice.  */
-#define FASTEST_ALIGNMENT (TARGET_SH5 ? 64 : 32)
-
-/* Make strings word-aligned so strcpy from constants will be faster.  */
-#define CONSTANT_ALIGNMENT(EXP, ALIGN)	\
-  ((TREE_CODE (EXP) == STRING_CST	\
-    && (ALIGN) < FASTEST_ALIGNMENT)	\
-    ? FASTEST_ALIGNMENT : (ALIGN))
+#define FASTEST_ALIGNMENT (32)
 
 /* get_mode_alignment assumes complex values are always held in multiple
    registers, but that is not the case on the SH; CQImode and CHImode are
-   held in a single integer register.  SH5 also holds CSImode and SCmode
-   values in integer registers.  This is relevant for argument passing on
-   SHcompact as we use a stack temp in order to pass CSImode by reference.  */
+   held in a single integer register.  */
 #define LOCAL_ALIGNMENT(TYPE, ALIGN) \
   ((GET_MODE_CLASS (TYPE_MODE (TYPE)) == MODE_COMPLEX_INT \
     || GET_MODE_CLASS (TYPE_MODE (TYPE)) == MODE_COMPLEX_FLOAT) \
@@ -566,9 +490,7 @@
 #define LABEL_ALIGN_AFTER_BARRIER(LABEL_AFTER_BARRIER) \
   barrier_align (LABEL_AFTER_BARRIER)
 
-#define LOOP_ALIGN(A_LABEL) \
-  ((! optimize || TARGET_HARD_SH4 || optimize_size) \
-   ? 0 : sh_loop_align (A_LABEL))
+#define LOOP_ALIGN(A_LABEL) sh_loop_align (A_LABEL)
 
 #define LABEL_ALIGN(A_LABEL) \
 (									\
@@ -584,26 +506,26 @@
 #define ADDR_VEC_ALIGN(ADDR_VEC) 2
 
 /* The base two logarithm of the known minimum alignment of an insn length.  */
-#define INSN_LENGTH_ALIGNMENT(A_INSN)					\
-  (NONJUMP_INSN_P (A_INSN)						\
-   ? 1 << TARGET_SHMEDIA						\
-   : JUMP_P (A_INSN) || CALL_P (A_INSN)					\
-   ? 1 << TARGET_SHMEDIA						\
+#define INSN_LENGTH_ALIGNMENT(A_INSN)		\
+  (NONJUMP_INSN_P (A_INSN)			\
+   ? 1						\
+   : JUMP_P (A_INSN) || CALL_P (A_INSN)		\
+   ? 1						\
    : CACHE_LOG)
 
 /* Standard register usage.  */
 
 /* Register allocation for the Renesas calling convention:
 
-        r0		arg return
-	r1..r3          scratch
+	r0		arg return
+	r1..r3		scratch
 	r4..r7		args in
 	r8..r13		call saved
 	r14		frame pointer/call saved
 	r15		stack pointer
 	ap		arg pointer (doesn't really exist, always eliminated)
 	pr		subroutine return address
-	t               t bit
+	t		t bit
 	mach		multiply/accumulate result, high part
 	macl		multiply/accumulate result, low part.
 	fpul		fp/int communication register
@@ -613,11 +535,11 @@
 	fr4..fr11	fp args in
 	fr12..fr15	call saved floating point registers  */
 
-#define MAX_REGISTER_NAME_LENGTH 5
+#define MAX_REGISTER_NAME_LENGTH 6
 extern char sh_register_names[][MAX_REGISTER_NAME_LENGTH + 1];
 
 #define SH_REGISTER_NAMES_INITIALIZER					\
-{				                   			\
+{									\
   "r0",   "r1",   "r2",   "r3",   "r4",   "r5",   "r6",   "r7", 	\
   "r8",   "r9",   "r10",  "r11",  "r12",  "r13",  "r14",  "r15",	\
   "r16",  "r17",  "r18",  "r19",  "r20",  "r21",  "r22",  "r23",	\
@@ -637,7 +559,7 @@
   "tr0",  "tr1",  "tr2",  "tr3",  "tr4",  "tr5",  "tr6",  "tr7", 	\
   "xd0",  "xd2",  "xd4",  "xd6",  "xd8",  "xd10", "xd12", "xd14",	\
   "gbr",  "ap",	  "pr",   "t",    "mach", "macl", "fpul", "fpscr",	\
-  "rap",  "sfp"								\
+  "rap",  "sfp", "fpscr0", "fpscr1"					\
 }
 
 #define REGNAMES_ARR_INDEX_1(index) \
@@ -662,7 +584,7 @@
   REGNAMES_ARR_INDEX_8 (128), \
   REGNAMES_ARR_INDEX_8 (136), \
   REGNAMES_ARR_INDEX_8 (144), \
-  REGNAMES_ARR_INDEX_2 (152) \
+  REGNAMES_ARR_INDEX_4 (152) \
 }
 
 #define ADDREGNAMES_SIZE 32
@@ -709,22 +631,18 @@
 /* There are many other relevant definitions in sh.md's md_constants.  */
 
 #define FIRST_GENERAL_REG R0_REG
-#define LAST_GENERAL_REG (FIRST_GENERAL_REG + (TARGET_SHMEDIA ? 63 : 15))
+#define LAST_GENERAL_REG (FIRST_GENERAL_REG + (15))
 #define FIRST_FP_REG DR0_REG
-#define LAST_FP_REG  (FIRST_FP_REG + \
-		      (TARGET_SHMEDIA_FPU ? 63 : TARGET_SH2E ? 15 : -1))
+#define LAST_FP_REG  (FIRST_FP_REG + (TARGET_SH2E ? 15 : -1))
 #define FIRST_XD_REG XD0_REG
 #define LAST_XD_REG  (FIRST_XD_REG + ((TARGET_SH4 && TARGET_FMOVD) ? 7 : -1))
-#define FIRST_TARGET_REG TR0_REG
-#define LAST_TARGET_REG  (FIRST_TARGET_REG + (TARGET_SHMEDIA ? 7 : -1))
 
 /* Registers that can be accessed through bank0 or bank1 depending on sr.md.  */
-
 #define FIRST_BANKED_REG R0_REG
 #define LAST_BANKED_REG R7_REG
 
-#define BANKED_REGISTER_P(REGNO)                       \
-  IN_RANGE ((REGNO),                                   \
+#define BANKED_REGISTER_P(REGNO) \
+  IN_RANGE ((REGNO), \
 	    (unsigned HOST_WIDE_INT) FIRST_BANKED_REG, \
 	    (unsigned HOST_WIDE_INT) LAST_BANKED_REG)
 
@@ -734,7 +652,7 @@
 	    (unsigned HOST_WIDE_INT) LAST_GENERAL_REG)
 
 #define GENERAL_OR_AP_REGISTER_P(REGNO) \
-  (GENERAL_REGISTER_P (REGNO) || ((REGNO) == AP_REG)	\
+  (GENERAL_REGISTER_P (REGNO) || ((REGNO) == AP_REG) \
    || ((REGNO) == FRAME_POINTER_REGNUM))
 
 #define FP_REGISTER_P(REGNO) \
@@ -751,46 +669,36 @@
 
 #define SPECIAL_REGISTER_P(REGNO) \
   ((REGNO) == GBR_REG || (REGNO) == T_REG \
-   || (REGNO) == MACH_REG || (REGNO) == MACL_REG)
+   || (REGNO) == MACH_REG || (REGNO) == MACL_REG \
+   || (REGNO) == FPSCR_MODES_REG || (REGNO) == FPSCR_STAT_REG)
 
-#define TARGET_REGISTER_P(REGNO) \
-  ((int) (REGNO) >= FIRST_TARGET_REG && (int) (REGNO) <= LAST_TARGET_REG)
-
-#define SHMEDIA_REGISTER_P(REGNO) \
+#define VALID_REGISTER_P(REGNO) \
   (GENERAL_REGISTER_P (REGNO) || FP_REGISTER_P (REGNO) \
-   || TARGET_REGISTER_P (REGNO))
-
-/* This is to be used in TARGET_CONDITIONAL_REGISTER_USAGE, to mark
-   registers that should be fixed.  */
-#define VALID_REGISTER_P(REGNO) \
-  (SHMEDIA_REGISTER_P (REGNO) || XD_REGISTER_P (REGNO) \
+   || XD_REGISTER_P (REGNO) \
    || (REGNO) == AP_REG || (REGNO) == RAP_REG \
    || (REGNO) == FRAME_POINTER_REGNUM \
-   || (TARGET_SH1 && (SPECIAL_REGISTER_P (REGNO) || (REGNO) == PR_REG)) \
+   || ((SPECIAL_REGISTER_P (REGNO) || (REGNO) == PR_REG)) \
    || (TARGET_SH2E && (REGNO) == FPUL_REG))
 
 /* The mode that should be generally used to store a register by
    itself in the stack, or to load it back.  */
 #define REGISTER_NATURAL_MODE(REGNO) \
-  (FP_REGISTER_P (REGNO) ? SFmode \
-   : XD_REGISTER_P (REGNO) ? DFmode \
-   : TARGET_SHMEDIA && ! HARD_REGNO_CALL_PART_CLOBBERED ((REGNO), DImode) \
-   ? DImode \
-   : SImode)
+  (FP_REGISTER_P (REGNO) ? E_SFmode \
+   : XD_REGISTER_P (REGNO) ? E_DFmode : E_SImode)
 
-#define FIRST_PSEUDO_REGISTER 154
+
+#define FIRST_PSEUDO_REGISTER 156
 
 /* Don't count soft frame pointer.  */
-#define DWARF_FRAME_REGISTERS (FIRST_PSEUDO_REGISTER - 1)
+#define DWARF_FRAME_REGISTERS (153)
 
 /* 1 for registers that have pervasive standard uses
    and are not available for the register allocator.
 
    Mach register is fixed 'cause it's only 10 bits wide for SH1.
    It is 32 bits wide for SH2.  */
-
-#define FIXED_REGISTERS  						\
-{				                   			\
+#define FIXED_REGISTERS							\
+{									\
 /* Regular registers.  */						\
   0,      0,      0,      0,      0,      0,      0,      0,		\
   0,      0,      0,      0,      0,      0,      0,      1,		\
@@ -818,8 +726,8 @@
   0,      0,      0,      0,      0,      0,      0,      0,		\
 /*"gbr",  "ap",	  "pr",   "t",    "mach", "macl", "fpul", "fpscr", */	\
   1,      1,      1,      1,      1,      1,      0,      1,		\
-/*"rap",  "sfp" */							\
-  1,	  1,								\
+/*"rap",  "sfp","fpscr0","fpscr1"  */					\
+  1,      1,      1,      1,						\
 }
 
 /* 1 for registers not available across function calls.
@@ -828,9 +736,8 @@
    The latter must include the registers where values are returned
    and the register where structure-value addresses are passed.
    Aside from that, you can include as many other registers as you like.  */
-
-#define CALL_USED_REGISTERS  						\
-{				                   			\
+#define CALL_USED_REGISTERS						\
+{									\
 /* Regular registers.  */						\
   1,      1,      1,      1,      1,      1,      1,      1,		\
   /* R8 and R9 are call-clobbered on SH5, but not on earlier SH ABIs.	\
@@ -858,67 +765,53 @@
   1,      1,      1,      1,      1,      1,      0,      0,		\
 /*"gbr",  "ap",	  "pr",   "t",    "mach", "macl", "fpul", "fpscr", */	\
   1,      1,      1,      1,      1,      1,      1,      1,		\
-/*"rap",  "sfp" */							\
-  1,	  1,								\
+/*"rap",  "sfp","fpscr0","fpscr1"  */					\
+  1,      1,      1,      1,						\
 }
 
-/* TARGET_CONDITIONAL_REGISTER_USAGE might want to make a register
-   call-used, yet fixed, like PIC_OFFSET_TABLE_REGNUM.  */
-#define CALL_REALLY_USED_REGISTERS CALL_USED_REGISTERS
-
-/* Only the lower 32-bits of R10-R14 are guaranteed to be preserved
-   across SHcompact function calls.  We can't tell whether a called
-   function is SHmedia or SHcompact, so we assume it may be when
-   compiling SHmedia code with the 32-bit ABI, since that's the only
-   ABI that can be linked with SHcompact code.  */
-#define HARD_REGNO_CALL_PART_CLOBBERED(REGNO,MODE) \
-  (TARGET_SHMEDIA32 \
-   && GET_MODE_SIZE (MODE) > 4 \
-   && (((REGNO) >= FIRST_GENERAL_REG + 10 \
-        && (REGNO) <= FIRST_GENERAL_REG + 15) \
-       || TARGET_REGISTER_P (REGNO) \
-       || (REGNO) == PR_MEDIA_REG))
-
-/* Return number of consecutive hard regs needed starting at reg REGNO
-   to hold something of mode MODE.
-   This is ordinarily the length in words of a value of mode MODE
-   but can be less for certain modes in special long registers.
-
-   On the SH all but the XD regs are UNITS_PER_WORD bits wide.  */
+/* CALL_REALLY_USED_REGISTERS is used as a default setting, which is then
+   overridden by -fcall-saved-* and -fcall-used-* options and then by
+   TARGET_CONDITIONAL_REGISTER_USAGE.  There we might want to make a
+   register call-used, yet fixed, like PIC_OFFSET_TABLE_REGNUM.  */
+#define CALL_REALLY_USED_REGISTERS 					\
+{									\
+/* Regular registers.  */						\
+  1,      1,      1,      1,      1,      1,      1,      1,		\
+  /* R8 and R9 are call-clobbered on SH5, but not on earlier SH ABIs.	\
+     Only the lower 32bits of R10-R14 are guaranteed to be preserved	\
+     across SH5 function calls.  */					\
+  0,      0,      0,      0,      0,      0,      0,      1,		\
+  1,      1,      1,      1,      1,      1,      1,      1,		\
+  1,      1,      1,      1,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      1,      1,      1,      1,		\
+  1,      1,      1,      1,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      1,      1,      1,      1,		\
+/* FP registers.  */							\
+  1,      1,      1,      1,      1,      1,      1,      1,		\
+  1,      1,      1,      1,      0,      0,      0,      0,		\
+  1,      1,      1,      1,      1,      1,      1,      1,		\
+  1,      1,      1,      1,      1,      1,      1,      1,		\
+  1,      1,      1,      1,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      0,      0,      0,      0,		\
+  0,      0,      0,      0,      0,      0,      0,      0,		\
+/* Branch target registers.  */						\
+  1,      1,      1,      1,      1,      0,      0,      0,		\
+/* XD registers.  */							\
+  1,      1,      1,      1,      1,      1,      0,      0,		\
+/*"gbr",  "ap",	  "pr",   "t",    "mach", "macl", "fpul", "fpscr", */	\
+  0,      1,      1,      1,      1,      1,      1,      1,		\
+/*"rap",  "sfp","fpscr0","fpscr1"  */					\
+  1,      1,      0,      0,						\
+}
 
-#define HARD_REGNO_NREGS(REGNO, MODE) \
-   (XD_REGISTER_P (REGNO) \
-    ? ((GET_MODE_SIZE (MODE) + (2*UNITS_PER_WORD - 1)) / (2*UNITS_PER_WORD)) \
-    : (TARGET_SHMEDIA && FP_REGISTER_P (REGNO)) \
-    ? ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD/2 - 1) / (UNITS_PER_WORD/2)) \
-    : ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD))
-
-/* Value is 1 if hard register REGNO can hold a value of machine-mode MODE.  */
-
-#define HARD_REGNO_MODE_OK(REGNO, MODE)		\
-  sh_hard_regno_mode_ok ((REGNO), (MODE))
-
-/* Value is 1 if it is a good idea to tie two pseudo registers
-   when one has mode MODE1 and one has mode MODE2.
-   If HARD_REGNO_MODE_OK could produce different values for MODE1 and MODE2,
-   for any hard reg, then this must be 0 for correct output.
-   That's the case for xd registers: we don't hold SFmode values in
-   them, so we can't tie an SFmode pseudos with one in another
-   floating-point mode.  */
-
-#define MODES_TIEABLE_P(MODE1, MODE2) \
-  ((MODE1) == (MODE2) \
-   || (TARGET_SHMEDIA \
-       && GET_MODE_SIZE (MODE1) == GET_MODE_SIZE (MODE2) \
-       && INTEGRAL_MODE_P (MODE1) && INTEGRAL_MODE_P (MODE2)) \
-   || (GET_MODE_CLASS (MODE1) == GET_MODE_CLASS (MODE2) \
-       && (TARGET_SHMEDIA ? ((GET_MODE_SIZE (MODE1) <= 4) \
-			      && (GET_MODE_SIZE (MODE2) <= 4)) \
-			  : ((MODE1) != SFmode && (MODE2) != SFmode))))
+/* Specify the modes required to caller save a given hard regno.  */
+#define HARD_REGNO_CALLER_SAVE_MODE(REGNO, NREGS, MODE)	\
+  sh_hard_regno_caller_save_mode ((REGNO), (NREGS), (MODE))
 
 /* A C expression that is nonzero if hard register NEW_REG can be
    considered for use as a rename register for OLD_REG register */
-
 #define HARD_REGNO_RENAME_OK(OLD_REG, NEW_REG) \
    sh_hard_regno_rename_ok (OLD_REG, NEW_REG)
 
@@ -945,6 +838,10 @@
    code access to data items.  */
 #define PIC_OFFSET_TABLE_REGNUM	(flag_pic ? PIC_REG : INVALID_REGNUM)
 
+/* For FDPIC, the FDPIC register is call-clobbered (otherwise PLT
+   entries would need to handle saving and restoring it).  */
+#define PIC_OFFSET_TABLE_REG_CALL_CLOBBERED TARGET_FDPIC
+
 #define GOT_SYMBOL_NAME "*_GLOBAL_OFFSET_TABLE_"
 
 /* Definitions for register eliminations.
@@ -954,14 +851,14 @@
    pointer register.  Secondly, the argument pointer register can always be
    eliminated; it is replaced with either the stack or frame pointer.
    Third, there is the return address pointer, which can also be replaced
-   with either the stack or the frame pointer.  */
+   with either the stack or the frame pointer.
 
-/* This is an array of structures.  Each structure initializes one pair
+   This is an array of structures.  Each structure initializes one pair
    of eliminable registers.  The "from" register number is given first,
    followed by "to".  Eliminations of the same "from" register are listed
-   in order of preference.  */
+   in order of preference.
 
-/* If you add any registers here that are not actually hard registers,
+   If you add any registers here that are not actually hard registers,
    and that have any alternative of elimination that doesn't always
    apply, you need to amend calc_live_regs to exclude it, because
    reload spills all eliminable registers where it sees an
@@ -969,7 +866,6 @@
    If you add any hard registers that can be eliminated in different
    ways, you have to patch reload to spill them only when all alternatives
    of elimination fail.  */
-
 #define ELIMINABLE_REGS						\
 {{ HARD_FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM},		\
  { FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM},			\
@@ -981,7 +877,6 @@
 
 /* Define the offset between two registers, one to be eliminated, and the other
    its replacement, at the start of a routine.  */
-
 #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \
   OFFSET = initial_elimination_offset ((FROM), (TO))
 
@@ -989,20 +884,13 @@
 #define ARG_POINTER_REGNUM	AP_REG
 
 /* Register in which the static-chain is passed to a function.  */
-#define STATIC_CHAIN_REGNUM	(TARGET_SH5 ? 1 : 3)
+#define STATIC_CHAIN_REGNUM	(3)
 
 /* Don't default to pcc-struct-return, because we have already specified
    exactly how to return structures in the TARGET_RETURN_IN_MEMORY
    target hook.  */
-
 #define DEFAULT_PCC_STRUCT_RETURN 0
 
-#define SHMEDIA_REGS_STACK_ADJUST() \
-  (TARGET_SHCOMPACT && crtl->saves_all_registers \
-   ? (8 * (/* r28-r35 */ 8 + /* r44-r59 */ 16 + /* tr5-tr7 */ 3) \
-      + (TARGET_FPU_ANY ? 4 * (/* fr36 - fr63 */ 28) : 0)) \
-   : 0)
-
 
 /* Define the classes of registers for register constraints in the
    machine description.  Also define ranges of constants.
@@ -1022,13 +910,14 @@
    in a smaller-numbered class.
 
    For any two classes, it is very desirable that there be another
-   class that represents their union.  */
+   class that represents their union.
 
-/* The SH has two sorts of general registers, R0 and the rest.  R0 can
+   The SH has two sorts of general registers, R0 and the rest.  R0 can
    be used as the destination of some of the arithmetic ops. There are
    also some special purpose registers; the T bit register, the
-   Procedure Return Register and the Multiply Accumulate Registers.  */
-/* Place GENERAL_REGS after FPUL_REGS so that it will be preferred by
+   Procedure Return Register and the Multiply Accumulate Registers.
+
+   Place GENERAL_REGS after FPUL_REGS so that it will be preferred by
    reg_class_subunion.  We don't want to have an actual union class
    of these, because it would only be used when both classes are calculated
    to give the same cost, but there is only one FPUL register.
@@ -1036,7 +925,6 @@
    applying to the actual instruction alternative considered.  E.g., the
    y/r alternative of movsi_ie is considered to have no more cost that
    the r/r alternative, which is patently untrue.  */
-
 enum reg_class
 {
   NO_REGS,
@@ -1046,10 +934,10 @@
   MAC_REGS,
   FPUL_REGS,
   SIBCALL_REGS,
+  NON_SP_REGS,
   GENERAL_REGS,
   FP0_REGS,
   FP_REGS,
-  DF_HI_REGS,
   DF_REGS,
   FPSCR_REGS,
   GENERAL_FP_REGS,
@@ -1071,10 +959,10 @@
   "MAC_REGS",		\
   "FPUL_REGS",		\
   "SIBCALL_REGS",	\
+  "NON_SP_REGS",	\
   "GENERAL_REGS",	\
   "FP0_REGS",		\
   "FP_REGS",		\
-  "DF_HI_REGS",		\
   "DF_REGS",		\
   "FPSCR_REGS",		\
   "GENERAL_FP_REGS",	\
@@ -1086,7 +974,6 @@
 /* Define which registers fit in which classes.
    This is an initializer for a vector of HARD_REG_SET
    of length N_REG_CLASSES.  */
-
 #define REG_CLASS_CONTENTS						\
 {									\
 /* NO_REGS:  */								\
@@ -1103,14 +990,14 @@
   { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00400000 },	\
 /* SIBCALL_REGS: Initialized in TARGET_CONDITIONAL_REGISTER_USAGE.  */	\
   { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },	\
+/* NON_SP_REGS:  */							\
+  { 0xffff7fff, 0xffffffff, 0x00000000, 0x00000000, 0x03020000 },	\
 /* GENERAL_REGS:  */							\
   { 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x03020000 },	\
 /* FP0_REGS:  */							\
   { 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 },	\
 /* FP_REGS:  */								\
   { 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0x00000000 },	\
-/* DF_HI_REGS:  Initialized in TARGET_CONDITIONAL_REGISTER_USAGE.  */		\
-  { 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0x0000ff00 },	\
 /* DF_REGS:  */								\
   { 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0x0000ff00 },	\
 /* FPSCR_REGS:  */							\
@@ -1122,31 +1009,16 @@
 /* TARGET_REGS:  */							\
   { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000ff },	\
 /* ALL_REGS:  */							\
-  { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x03ffffff },	\
+  { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x0fffffff },	\
 }
 
 /* The same information, inverted:
    Return the class number of the smallest class containing
    reg number REGNO.  This could be a conditional expression
    or could index an array.  */
-
 extern enum reg_class regno_reg_class[FIRST_PSEUDO_REGISTER];
 #define REGNO_REG_CLASS(REGNO) regno_reg_class[(REGNO)]
 
-/* The following macro defines cover classes for Integrated Register
-   Allocator.  Cover classes is a set of non-intersected register
-   classes covering all hard registers used for register allocation
-   purpose.  Any move between two registers of a cover class should be
-   cheaper than load or store of the registers.  The macro value is
-   array of register classes with LIM_REG_CLASSES used as the end
-   marker.  */
-
-#define IRA_COVER_CLASSES						     \
-{									     \
-  GENERAL_REGS, FP_REGS, PR_REGS, T_REGS, MAC_REGS, TARGET_REGS,  	     \
-  FPUL_REGS, LIM_REG_CLASSES						     \
-}
-
 /* When this hook returns true for MODE, the compiler allows
    registers explicitly used in the rtl to be used as spill registers
    but prevents the compiler from extending the lifetime of these
@@ -1183,108 +1055,24 @@
     44, 45, 46, 47, 48, 49, 50, 51, \
     52, 53, 54, 55, 56, 57, 58, 59, \
    /* FPUL */ 150, \
-   /* SH5 branch target registers */ \
-   128,129,130,131,132,133,134,135, \
    /* Fixed registers */ \
     15, 16, 24, 25, 26, 27, 63,144, \
-   145,146,147,148,149,152,153 }
+   145,146,147,148,149,152,153,154,155  }
 
 /* The class value for index registers, and the one for base regs.  */
-#define INDEX_REG_CLASS \
-  (!ALLOW_INDEXED_ADDRESS ? NO_REGS : TARGET_SHMEDIA ? GENERAL_REGS : R0_REGS)
-#define BASE_REG_CLASS	 GENERAL_REGS
+#define INDEX_REG_CLASS R0_REGS
+#define BASE_REG_CLASS GENERAL_REGS
 
 /* Defines for sh.md and constraints.md.  */
 
-#define CONST_OK_FOR_I06(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -32 \
-				 && ((HOST_WIDE_INT)(VALUE)) <= 31)
 #define CONST_OK_FOR_I08(VALUE) (((HOST_WIDE_INT)(VALUE))>= -128 \
 				 && ((HOST_WIDE_INT)(VALUE)) <= 127)
-#define CONST_OK_FOR_I10(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -512 \
-				 && ((HOST_WIDE_INT)(VALUE)) <= 511)
-#define CONST_OK_FOR_I16(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -32768 \
-				 && ((HOST_WIDE_INT)(VALUE)) <= 32767)
-
-#define CONST_OK_FOR_J16(VALUE) \
-  ((HOST_BITS_PER_WIDE_INT >= 64 && (VALUE) == (HOST_WIDE_INT) 0xffffffff) \
-   || (HOST_BITS_PER_WIDE_INT >= 64 && (VALUE) == (HOST_WIDE_INT) -1 << 32))
 
 #define CONST_OK_FOR_K08(VALUE) (((HOST_WIDE_INT)(VALUE))>= 0 \
 				 && ((HOST_WIDE_INT)(VALUE)) <= 255)
 
-#if 0
-#define SECONDARY_INOUT_RELOAD_CLASS(CLASS,MODE,X,ELSE) \
-  ((((REGCLASS_HAS_FP_REG (CLASS) 					\
-      && (REG_P (X)							\
-      && (GENERAL_OR_AP_REGISTER_P (REGNO (X))				\
-	  || (FP_REGISTER_P (REGNO (X)) && (MODE) == SImode		\
-	      && TARGET_FMOVD))))					\
-     || (REGCLASS_HAS_GENERAL_REG (CLASS) 				\
-	 && REG_P (X)							\
-	 && FP_REGISTER_P (REGNO (X))))					\
-    && ! TARGET_SHMEDIA							\
-    && ((MODE) == SFmode || (MODE) == SImode))				\
-   ? FPUL_REGS								\
-   : (((CLASS) == FPUL_REGS						\
-       || (REGCLASS_HAS_FP_REG (CLASS)					\
-	   && ! TARGET_SHMEDIA && MODE == SImode))			\
-      && (MEM_P (X)							\
-	  || (REG_P (X)							\
-	      && (REGNO (X) >= FIRST_PSEUDO_REGISTER			\
-		  || REGNO (X) == T_REG					\
-		  || system_reg_operand (X, VOIDmode)))))		\
-   ? GENERAL_REGS							\
-   : (((CLASS) == TARGET_REGS						\
-       || (TARGET_SHMEDIA && (CLASS) == SIBCALL_REGS))			\
-      && !satisfies_constraint_Csy (X)					\
-      && (!REG_P (X) || ! GENERAL_REGISTER_P (REGNO (X))))		\
-   ? GENERAL_REGS							\
-   : (((CLASS) == MAC_REGS || (CLASS) == PR_REGS)			\
-      && REG_P (X) && ! GENERAL_REGISTER_P (REGNO (X))			\
-      && (CLASS) != REGNO_REG_CLASS (REGNO (X)))			\
-   ? GENERAL_REGS							\
-   : ((CLASS) != GENERAL_REGS && REG_P (X)				\
-      && TARGET_REGISTER_P (REGNO (X)))					\
-   ? GENERAL_REGS : (ELSE))
-
-#define SECONDARY_OUTPUT_RELOAD_CLASS(CLASS,MODE,X) \
- SECONDARY_INOUT_RELOAD_CLASS(CLASS,MODE,X,NO_REGS)
-
-#define SECONDARY_INPUT_RELOAD_CLASS(CLASS,MODE,X)  \
-  ((REGCLASS_HAS_FP_REG (CLASS) 					\
-    && ! TARGET_SHMEDIA							\
-    && immediate_operand ((X), (MODE))					\
-    && ! ((fp_zero_operand (X) || fp_one_operand (X))			\
-	  && (MODE) == SFmode && fldi_ok ()))				\
-   ? R0_REGS								\
-   : ((CLASS) == FPUL_REGS						\
-      && ((REG_P (X)							\
-	   && (REGNO (X) == MACL_REG || REGNO (X) == MACH_REG		\
-	       || REGNO (X) == T_REG))					\
-	  || GET_CODE (X) == PLUS))					\
-   ? GENERAL_REGS							\
-   : (CLASS) == FPUL_REGS && immediate_operand ((X), (MODE))		\
-   ? (satisfies_constraint_I08 (X)					\
-      ? GENERAL_REGS							\
-      : R0_REGS)							\
-   : ((CLASS) == FPSCR_REGS						\
-      && ((REG_P (X) && REGNO (X) >= FIRST_PSEUDO_REGISTER)		\
-	  || (MEM_P (X) && GET_CODE (XEXP ((X), 0)) == PLUS)))		\
-   ? GENERAL_REGS							\
-   : (REGCLASS_HAS_FP_REG (CLASS) 					\
-      && TARGET_SHMEDIA							\
-      && immediate_operand ((X), (MODE))				\
-      && (X) != CONST0_RTX (GET_MODE (X))				\
-      && GET_MODE (X) != V4SFmode)					\
-   ? GENERAL_REGS							\
-   : (((MODE) == QImode || (MODE) == HImode)				\
-      && TARGET_SHMEDIA && inqhi_operand ((X), (MODE)))			\
-   ? GENERAL_REGS							\
-   : (TARGET_SHMEDIA && (CLASS) == GENERAL_REGS				\
-      && (GET_CODE (X) == LABEL_REF || PIC_ADDR_P (X)))			\
-   ? TARGET_REGS							\
-   : SECONDARY_INOUT_RELOAD_CLASS((CLASS),(MODE),(X), NO_REGS))
-#endif
+#define ZERO_EXTRACT_ANDMASK(EXTRACT_SZ_RTX, EXTRACT_POS_RTX)\
+  (((1 << INTVAL (EXTRACT_SZ_RTX)) - 1) << INTVAL (EXTRACT_POS_RTX))
 
 /* Return the maximum number of consecutive registers
    needed to represent mode MODE in a register of class CLASS.
@@ -1292,50 +1080,35 @@
    If TARGET_SHMEDIA, we need two FP registers per word.
    Otherwise we will need at most one register per word.  */
 #define CLASS_MAX_NREGS(CLASS, MODE) \
-    (TARGET_SHMEDIA \
-     && TEST_HARD_REG_BIT (reg_class_contents[CLASS], FIRST_FP_REG) \
-     ? (GET_MODE_SIZE (MODE) + UNITS_PER_WORD/2 - 1) / (UNITS_PER_WORD/2) \
-     : (GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
-
-/* If defined, gives a class of registers that cannot be used as the
-   operand of a SUBREG that changes the mode of the object illegally.  */
-/* ??? We need to renumber the internal numbers for the frnn registers
-   when in little endian in order to allow mode size changes.  */
-
-#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) 			    \
-  sh_cannot_change_mode_class (FROM, TO, CLASS)
+  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
 
 /* Stack layout; function entry, exit and calling.  */
 
 /* Define the number of registers that can hold parameters.
    These macros are used only in other macro definitions below.  */
-
 #define NPARM_REGS(MODE) \
   (TARGET_FPU_ANY && (MODE) == SFmode \
-   ? (TARGET_SH5 ? 12 : 8) \
-   : (TARGET_SH4 || TARGET_SH2A_DOUBLE) && (GET_MODE_CLASS (MODE) == MODE_FLOAT \
-		    || GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT) \
-   ? (TARGET_SH5 ? 12 : 8) \
-   : (TARGET_SH5 ? 8 : 4))
+   ? 8 \
+   : TARGET_FPU_DOUBLE \
+     && (GET_MODE_CLASS (MODE) == MODE_FLOAT \
+	 || GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT) \
+   ? 8 \
+   : 4)
 
-#define FIRST_PARM_REG (FIRST_GENERAL_REG + (TARGET_SH5 ? 2 : 4))
-#define FIRST_RET_REG  (FIRST_GENERAL_REG + (TARGET_SH5 ? 2 : 0))
+#define FIRST_PARM_REG (FIRST_GENERAL_REG + 4)
+#define FIRST_RET_REG  (FIRST_GENERAL_REG + 0)
 
-#define FIRST_FP_PARM_REG (FIRST_FP_REG + (TARGET_SH5 ? 0 : 4))
+#define FIRST_FP_PARM_REG (FIRST_FP_REG + 4)
 #define FIRST_FP_RET_REG FIRST_FP_REG
 
 /* Define this if pushing a word on the stack
    makes the stack pointer a smaller address.  */
-#define STACK_GROWS_DOWNWARD
+#define STACK_GROWS_DOWNWARD 1
 
 /*  Define this macro to nonzero if the addresses of local variable slots
     are at negative offsets from the frame pointer.  */
 #define FRAME_GROWS_DOWNWARD 1
 
-/* Offset from the frame pointer to the first local variable slot to
-   be allocated.  */
-#define STARTING_FRAME_OFFSET  0
-
 /* If we generate an insn to push BYTES bytes,
    this says how many the stack pointer really advances by.  */
 /* Don't define PUSH_ROUNDING, since the hardware doesn't do this.
@@ -1350,17 +1123,15 @@
 
 /* Value is the number of bytes of arguments automatically popped when
    calling a subroutine.
-   CUM is the accumulated argument list.
-
-   On SHcompact, the call trampoline pops arguments off the stack.  */
-#define CALL_POPS_ARGS(CUM) (TARGET_SHCOMPACT ? (CUM).stack_regs * 8 : 0)
+   CUM is the accumulated argument list.  */
+#define CALL_POPS_ARGS(CUM) (0)
 
 /* Some subroutine macros specific to this machine.  */
 
 #define BASE_RETURN_VALUE_REG(MODE) \
-  ((TARGET_FPU_ANY && ((MODE) == SFmode))			\
+  ((TARGET_FPU_ANY && ((MODE) == SFmode))		\
    ? FIRST_FP_RET_REG					\
-   : TARGET_FPU_ANY && (MODE) == SCmode		\
+   : TARGET_FPU_ANY && (MODE) == SCmode			\
    ? FIRST_FP_RET_REG					\
    : (TARGET_FPU_DOUBLE					\
       && ((MODE) == DFmode || (MODE) == SFmode		\
@@ -1371,8 +1142,9 @@
 #define BASE_ARG_REG(MODE) \
   ((TARGET_SH2E && ((MODE) == SFmode))			\
    ? FIRST_FP_PARM_REG					\
-   : (TARGET_SH4 || TARGET_SH2A_DOUBLE) && (GET_MODE_CLASS (MODE) == MODE_FLOAT	\
-		    || GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT)\
+   : TARGET_FPU_DOUBLE					\
+     && (GET_MODE_CLASS (MODE) == MODE_FLOAT		\
+	 || GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT)\
    ? FIRST_FP_PARM_REG					\
    : FIRST_PARM_REG)
 
@@ -1382,11 +1154,13 @@
 #define FUNCTION_ARG_REGNO_P(REGNO) \
   (((unsigned) (REGNO) >= (unsigned) FIRST_PARM_REG			\
     && (unsigned) (REGNO) < (unsigned) (FIRST_PARM_REG + NPARM_REGS (SImode)))\
-   || (TARGET_FPU_ANY                                                   \
+   || (TARGET_FPU_ANY							\
        && (unsigned) (REGNO) >= (unsigned) FIRST_FP_PARM_REG		\
        && (unsigned) (REGNO) < (unsigned) (FIRST_FP_PARM_REG		\
 					   + NPARM_REGS (SFmode))))
 
+#ifdef __cplusplus
+
 /* Define a data type for recording info about an argument list
    during the scan of that argument list.  This data type should
    hold all necessary information about the function itself
@@ -1399,139 +1173,35 @@
    Thus NARGREGS or more means all following args should go on the stack.  */
 
 enum sh_arg_class { SH_ARG_INT = 0, SH_ARG_FLOAT = 1 };
-struct sh_args {
-    int arg_count[2];
-    int force_mem;
+
+struct sh_args
+{
+  /* How many SH_ARG_INT and how many SH_ARG_FLOAT args there are.  */
+  int arg_count[2];
+
+  bool force_mem;
+
   /* Nonzero if a prototype is available for the function.  */
-    int prototype_p;
+  bool prototype_p;
+
   /* The number of an odd floating-point register, that should be used
      for the next argument of type float.  */
-    int free_single_fp_reg;
-  /* Whether we're processing an outgoing function call.  */
-    int outgoing;
-  /* The number of general-purpose registers that should have been
-     used to pass partial arguments, that are passed totally on the
-     stack.  On SHcompact, a call trampoline will pop them off the
-     stack before calling the actual function, and, if the called
-     function is implemented in SHcompact mode, the incoming arguments
-     decoder will push such arguments back onto the stack.  For
-     incoming arguments, STACK_REGS also takes into account other
-     arguments passed by reference, that the decoder will also push
-     onto the stack.  */
-    int stack_regs;
-  /* The number of general-purpose registers that should have been
-     used to pass arguments, if the arguments didn't have to be passed
-     by reference.  */
-    int byref_regs;
-  /* Set as by shcompact_byref if the current argument is to be passed
-     by reference.  */
-    int byref;
-
-  /* call_cookie is a bitmask used by call expanders, as well as
-     function prologue and epilogues, to allow SHcompact to comply
-     with the SH5 32-bit ABI, that requires 64-bit registers to be
-     used even though only the lower 32-bit half is visible in
-     SHcompact mode.  The strategy is to call SHmedia trampolines.
-
-     The alternatives for each of the argument-passing registers are
-     (a) leave it unchanged; (b) pop it off the stack; (c) load its
-     contents from the address in it; (d) add 8 to it, storing the
-     result in the next register, then (c); (e) copy it from some
-     floating-point register,
+  int free_single_fp_reg;
 
-     Regarding copies from floating-point registers, r2 may only be
-     copied from dr0.  r3 may be copied from dr0 or dr2.  r4 maybe
-     copied from dr0, dr2 or dr4.  r5 maybe copied from dr0, dr2,
-     dr4 or dr6.  r6 may be copied from dr0, dr2, dr4, dr6 or dr8.
-     r7 through to r9 may be copied from dr0, dr2, dr4, dr8, dr8 or
-     dr10.
-
-     The bit mask is structured as follows:
-
-     - 1 bit to tell whether to set up a return trampoline.
-
-     - 3 bits to count the number consecutive registers to pop off the
-       stack.
-
-     - 4 bits for each of r9, r8, r7 and r6.
-
-     - 3 bits for each of r5, r4, r3 and r2.
-
-     - 3 bits set to 0 (the most significant ones)
-
-        3           2            1           0
-       1098 7654 3210 9876 5432 1098 7654 3210
-       FLPF LPFL PFLP FFLP FFLP FFLP FFLP SSST
-       2223 3344 4555 6666 7777 8888 9999 SSS-
-
-     - If F is set, the register must be copied from an FP register,
-       whose number is encoded in the remaining bits.
-
-     - Else, if L is set, the register must be loaded from the address
-       contained in it.  If the P bit is *not* set, the address of the
-       following dword should be computed first, and stored in the
-       following register.
-
-     - Else, if P is set, the register alone should be popped off the
-       stack.
-
-     - After all this processing, the number of registers represented
-       in SSS will be popped off the stack.  This is an optimization
-       for pushing/popping consecutive registers, typically used for
-       varargs and large arguments partially passed in registers.
-
-     - If T is set, a return trampoline will be set up for 64-bit
-     return values to be split into 2 32-bit registers.  */
-    long call_cookie;
+  /* Whether we're processing an outgoing function call.  */
+  bool outgoing;
 
   /* This is set to nonzero when the call in question must use the Renesas ABI,
      even without the -mrenesas option.  */
-    int renesas_abi;
+  bool renesas_abi;
 };
 
-#define CALL_COOKIE_RET_TRAMP_SHIFT 0
-#define CALL_COOKIE_RET_TRAMP(VAL) ((VAL) << CALL_COOKIE_RET_TRAMP_SHIFT)
-#define CALL_COOKIE_STACKSEQ_SHIFT 1
-#define CALL_COOKIE_STACKSEQ(VAL) ((VAL) << CALL_COOKIE_STACKSEQ_SHIFT)
-#define CALL_COOKIE_STACKSEQ_GET(COOKIE) \
-  (((COOKIE) >> CALL_COOKIE_STACKSEQ_SHIFT) & 7)
-#define CALL_COOKIE_INT_REG_SHIFT(REG) \
-  (4 * (7 - (REG)) + (((REG) <= 2) ? ((REG) - 2) : 1) + 3)
-#define CALL_COOKIE_INT_REG(REG, VAL) \
-  ((VAL) << CALL_COOKIE_INT_REG_SHIFT (REG))
-#define CALL_COOKIE_INT_REG_GET(COOKIE, REG) \
-  (((COOKIE) >> CALL_COOKIE_INT_REG_SHIFT (REG)) & ((REG) < 4 ? 7 : 15))
-
-#define CUMULATIVE_ARGS  struct sh_args
+typedef sh_args CUMULATIVE_ARGS;
 
-#define GET_SH_ARG_CLASS(MODE) \
-  ((TARGET_FPU_ANY && (MODE) == SFmode) \
-   ? SH_ARG_FLOAT \
-   /* There's no mention of complex float types in the SH5 ABI, so we
-      should presumably handle them as aggregate types.  */ \
-   : TARGET_SH5 && GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT \
-   ? SH_ARG_INT \
-   : TARGET_FPU_DOUBLE && (GET_MODE_CLASS (MODE) == MODE_FLOAT \
-			   || GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT) \
-   ? SH_ARG_FLOAT : SH_ARG_INT)
-
-#define ROUND_ADVANCE(SIZE) \
-  (((SIZE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
+/* Set when processing a function with interrupt attribute.  */
+extern bool current_function_interrupt;
 
-/* Round a register number up to a proper boundary for an arg of mode
-   MODE.
-
-   The SH doesn't care about double alignment, so we only
-   round doubles to even regs when asked to explicitly.  */
-
-#define ROUND_REG(CUM, MODE) \
-   (((TARGET_ALIGN_DOUBLE					\
-      || ((TARGET_SH4 || TARGET_SH2A_DOUBLE) && ((MODE) == DFmode || (MODE) == DCmode)	\
-	  && (CUM).arg_count[(int) SH_ARG_FLOAT] < NPARM_REGS (MODE)))\
-     && GET_MODE_UNIT_SIZE ((MODE)) > UNITS_PER_WORD)		\
-    ? ((CUM).arg_count[(int) GET_SH_ARG_CLASS (MODE)]		\
-       + ((CUM).arg_count[(int) GET_SH_ARG_CLASS (MODE)] & 1))	\
-    : (CUM).arg_count[(int) GET_SH_ARG_CLASS (MODE)])
+#endif // __cplusplus
 
 /* Initialize a variable CUM of type CUMULATIVE_ARGS
    for a call to a function whose data type is FNTYPE.
@@ -1541,35 +1211,13 @@
    the same reg for a given argument class.
 
    For TARGET_HITACHI, the structure value pointer is passed in memory.  */
-
 #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \
-  sh_init_cumulative_args (& (CUM), (FNTYPE), (LIBNAME), (FNDECL), (N_NAMED_ARGS), VOIDmode)
+  sh_init_cumulative_args (& (CUM), (FNTYPE), (LIBNAME), (FNDECL),\
+			   (N_NAMED_ARGS), VOIDmode)
 
 #define INIT_CUMULATIVE_LIBCALL_ARGS(CUM, MODE, LIBNAME) \
   sh_init_cumulative_args (& (CUM), NULL_TREE, (LIBNAME), NULL_TREE, 0, (MODE))
 
-/* Return boolean indicating arg of mode MODE will be passed in a reg.
-   This macro is only used in this file.  */
-
-#define PASS_IN_REG_P(CUM, MODE, TYPE) \
-  (((TYPE) == 0 \
-    || (! TREE_ADDRESSABLE ((TYPE)) \
-	&& (! (TARGET_HITACHI || (CUM).renesas_abi) \
-	    || ! (AGGREGATE_TYPE_P (TYPE) \
-		  || (!TARGET_FPU_ANY \
-		      && (GET_MODE_CLASS (MODE) == MODE_FLOAT \
-			  && GET_MODE_SIZE (MODE) > GET_MODE_SIZE (SFmode))))))) \
-   && ! (CUM).force_mem \
-   && (TARGET_SH2E \
-       ? ((MODE) == BLKmode \
-	  ? (((CUM).arg_count[(int) SH_ARG_INT] * UNITS_PER_WORD \
-	      + int_size_in_bytes (TYPE)) \
-	     <= NPARM_REGS (SImode) * UNITS_PER_WORD) \
-	  : ((ROUND_REG((CUM), (MODE)) \
-	      + HARD_REGNO_NREGS (BASE_ARG_REG (MODE), (MODE))) \
-	     <= NPARM_REGS (MODE))) \
-       : ROUND_REG ((CUM), (MODE)) < NPARM_REGS (MODE)))
-
 /* By accident we got stuck with passing SCmode on SH4 little endian
    in two registers that are nominally successive - which is different from
    two single SFmode values, where we take endianness translation into
@@ -1584,82 +1232,15 @@
    foo (double); a: fr5,fr4
    foo (float a, float b); a: fr5 b: fr4
    foo (__complex float a); a.real fr4 a.imag: fr5 - for consistency,
-                            this should be the other way round...
+			    this should be the other way round...
    foo (float a, __complex float b); a: fr5 b.real: fr4 b.imag: fr7  */
 #define FUNCTION_ARG_SCmode_WART 1
 
-/* If an argument of size 5, 6 or 7 bytes is to be passed in a 64-bit
-   register in SHcompact mode, it must be padded in the most
-   significant end.  This means that passing it by reference wouldn't
-   pad properly on a big-endian machine.  In this particular case, we
-   pass this argument on the stack, in a way that the call trampoline
-   will load its value into the appropriate register.  */
-#define SHCOMPACT_FORCE_ON_STACK(MODE,TYPE) \
-  ((MODE) == BLKmode \
-   && TARGET_SHCOMPACT \
-   && ! TARGET_LITTLE_ENDIAN \
-   && int_size_in_bytes (TYPE) > 4 \
-   && int_size_in_bytes (TYPE) < 8)
-
 /* Minimum alignment for an argument to be passed by callee-copy
    reference.  We need such arguments to be aligned to 8 byte
    boundaries, because they'll be loaded using quad loads.  */
 #define SH_MIN_ALIGN_FOR_CALLEE_COPY (8 * BITS_PER_UNIT)
 
-/* The SH5 ABI requires floating-point arguments to be passed to
-   functions without a prototype in both an FP register and a regular
-   register or the stack.  When passing the argument in both FP and
-   general-purpose registers, list the FP register first.  */
-#define SH5_PROTOTYPELESS_FLOAT_ARG(CUM,MODE) \
-  (gen_rtx_PARALLEL							\
-   ((MODE),								\
-    gen_rtvec (2,							\
-	       gen_rtx_EXPR_LIST					\
-	       (VOIDmode,						\
-		((CUM).arg_count[(int) SH_ARG_INT] < NPARM_REGS (SImode) \
-		 ? gen_rtx_REG ((MODE), FIRST_FP_PARM_REG		\
-				+ (CUM).arg_count[(int) SH_ARG_FLOAT])	\
-		 : NULL_RTX),						\
-		const0_rtx),						\
-	       gen_rtx_EXPR_LIST					\
-	       (VOIDmode,						\
-		((CUM).arg_count[(int) SH_ARG_INT] < NPARM_REGS (SImode) \
-		 ? gen_rtx_REG ((MODE), FIRST_PARM_REG			\
-				+ (CUM).arg_count[(int) SH_ARG_INT])	\
-		 : gen_rtx_REG ((MODE), FIRST_FP_PARM_REG		\
-				+ (CUM).arg_count[(int) SH_ARG_FLOAT])), \
-		const0_rtx))))
-
-/* The SH5 ABI requires regular registers or stack slots to be
-   reserved for floating-point arguments.  Registers are taken care of
-   in FUNCTION_ARG_ADVANCE, but stack slots must be reserved here.
-   Unfortunately, there's no way to just reserve a stack slot, so
-   we'll end up needlessly storing a copy of the argument in the
-   stack.  For incoming arguments, however, the PARALLEL will be
-   optimized to the register-only form, and the value in the stack
-   slot won't be used at all.  */
-#define SH5_PROTOTYPED_FLOAT_ARG(CUM,MODE,REG) \
-  ((CUM).arg_count[(int) SH_ARG_INT] < NPARM_REGS (SImode)		\
-   ? gen_rtx_REG ((MODE), (REG))					\
-   : gen_rtx_PARALLEL ((MODE),						\
-		       gen_rtvec (2,					\
-				  gen_rtx_EXPR_LIST			\
-				  (VOIDmode, NULL_RTX,			\
-				   const0_rtx),				\
-				  gen_rtx_EXPR_LIST			\
-				  (VOIDmode, gen_rtx_REG ((MODE),	\
-							  (REG)),	\
-				   const0_rtx))))
-
-#define SH5_WOULD_BE_PARTIAL_NREGS(CUM, MODE, TYPE, NAMED) \
-  (TARGET_SH5							\
-   && ((MODE) == BLKmode || (MODE) == TImode || (MODE) == CDImode \
-       || (MODE) == DCmode) \
-   && ((CUM).arg_count[(int) SH_ARG_INT]			\
-       + (((MODE) == BLKmode ? int_size_in_bytes (TYPE)		\
-			     : GET_MODE_SIZE (MODE))		\
-	  + 7) / 8) > NPARM_REGS (SImode))
-
 /* Perform any needed actions needed for a function that is receiving a
    variable number of arguments.  */
 
@@ -1667,90 +1248,70 @@
    We use two .aligns, so as to make sure that both the .long is aligned
    on a 4 byte boundary, and that the .long is a fixed distance (2 bytes)
    from the trapa instruction.  */
-
 #define FUNCTION_PROFILER(STREAM,LABELNO)			\
 {								\
-  if (TARGET_SHMEDIA)						\
-    {								\
-      fprintf((STREAM), "\tmovi\t33,r0\n");			\
-      fprintf((STREAM), "\ttrapa\tr0\n");			\
-      asm_fprintf((STREAM), "\t.long\t%LLP%d\n", (LABELNO));	\
-    }								\
-  else								\
-    {								\
-      fprintf((STREAM), "\t.align\t2\n");			\
-      fprintf((STREAM), "\ttrapa\t#33\n");			\
-      fprintf((STREAM), "\t.align\t2\n");			\
-      asm_fprintf((STREAM), "\t.long\t%LLP%d\n", (LABELNO));	\
-    }								\
+  fprintf((STREAM), "\t.align\t2\n");				\
+  fprintf((STREAM), "\ttrapa\t#33\n");				\
+  fprintf((STREAM), "\t.align\t2\n");				\
+  asm_fprintf((STREAM), "\t.long\t%LLP%d\n", (LABELNO));	\
 }
 
 /* Define this macro if the code for function profiling should come
    before the function prologue.  Normally, the profiling code comes
    after.  */
-
 #define PROFILE_BEFORE_PROLOGUE
 
 /* EXIT_IGNORE_STACK should be nonzero if, when returning from a function,
    the stack pointer does not matter.  The value is tested only in
    functions that have frame pointers.
    No definition is equivalent to always zero.  */
-
 #define EXIT_IGNORE_STACK 1
 
 /*
    On the SH, the trampoline looks like
-   2 0002 D202     	   	mov.l	l2,r2
-   1 0000 D301     		mov.l	l1,r3
-   3 0004 422B     		jmp	@r2
-   4 0006 0009     		nop
+   2 0002 D202			mov.l	l2,r2
+   1 0000 D301			mov.l	l1,r3
+   3 0004 422B			jmp	@r2
+   4 0006 0009			nop
    5 0008 00000000 	l1:  	.long   area
    6 000c 00000000 	l2:	.long   function  */
 
 /* Length in units of the trampoline for entering a nested function.  */
-#define TRAMPOLINE_SIZE  (TARGET_SHMEDIA64 ? 40 : TARGET_SH5 ? 24 : 16)
+#define TRAMPOLINE_SIZE (TARGET_FDPIC ? 32 : 16)
 
-/* Alignment required for a trampoline in bits .  */
+/* Alignment required for a trampoline in bits.  */
 #define TRAMPOLINE_ALIGNMENT \
-  ((CACHE_LOG < 3 || (optimize_size && ! TARGET_HARVARD)) ? 32 \
-   : TARGET_SHMEDIA ? 256 : 64)
+  ((CACHE_LOG < 3 \
+    || (optimize_size && ! (TARGET_HARD_SH4))) ? 32 \
+   : 64)
 
 /* A C expression whose value is RTL representing the value of the return
    address for the frame COUNT steps up from the current frame.
    FRAMEADDR is already the frame pointer of the COUNT frame, so we
    can ignore COUNT.  */
-
 #define RETURN_ADDR_RTX(COUNT, FRAME)	\
-  (((COUNT) == 0) ? sh_get_pr_initial_val () : (rtx) 0)
+  (((COUNT) == 0) ? sh_get_pr_initial_val () : NULL_RTX)
 
 /* A C expression whose value is RTL representing the location of the
    incoming return address at the beginning of any function, before the
    prologue.  This RTL is either a REG, indicating that the return
    value is saved in REG, or a MEM representing a location in
    the stack.  */
-#define INCOMING_RETURN_ADDR_RTX \
-  gen_rtx_REG (Pmode, TARGET_SHMEDIA ? PR_MEDIA_REG : PR_REG)
+#define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, PR_REG)
 
 /* Addressing modes, and classification of registers for them.  */
 #define HAVE_POST_INCREMENT  TARGET_SH1
 #define HAVE_PRE_DECREMENT   TARGET_SH1
 
-#define USE_LOAD_POST_INCREMENT(mode)    ((mode == SImode || mode == DImode) \
-                                           ? 0 : TARGET_SH1)
-#define USE_LOAD_PRE_DECREMENT(mode)     0
-#define USE_STORE_POST_INCREMENT(mode)   0
-#define USE_STORE_PRE_DECREMENT(mode)    ((mode == SImode || mode == DImode) \
-                                           ? 0 : TARGET_SH1)
+#define USE_LOAD_POST_INCREMENT(mode) TARGET_SH1
+#define USE_LOAD_PRE_DECREMENT(mode) TARGET_SH2A
+#define USE_STORE_POST_INCREMENT(mode) TARGET_SH2A
+#define USE_STORE_PRE_DECREMENT(mode) TARGET_SH1
 
-#define MOVE_BY_PIECES_P(SIZE, ALIGN) \
-  (move_by_pieces_ninsns (SIZE, ALIGN, MOVE_MAX_PIECES + 1) \
-   < (optimize_size ? 2 : ((ALIGN >= 32) ? 16 : 2)))
+/* If a memory clear move would take CLEAR_RATIO or more simple
+   move-instruction pairs, we will do a setmem instead.  */
 
-#define STORE_BY_PIECES_P(SIZE, ALIGN) \
-  (move_by_pieces_ninsns (SIZE, ALIGN, STORE_MAX_PIECES + 1) \
-   < (optimize_size ? 2 : ((ALIGN >= 32) ? 16 : 2)))
-
-#define SET_BY_PIECES_P(SIZE, ALIGN) STORE_BY_PIECES_P(SIZE, ALIGN)
+#define CLEAR_RATIO(speed) ((speed) ? 15 : 3)
 
 /* Macros to check register numbers against specific register classes.  */
 
@@ -1758,40 +1319,25 @@
    They give nonzero only if REGNO is a hard reg of the suitable class
    or a pseudo reg currently allocated to a suitable hard reg.
    Since they use reg_renumber, they are safe only once reg_renumber
-   has been allocated, which happens in local-alloc.c.  */
-
+   has been allocated, which happens in reginfo.c during register
+   allocation.  */
 #define REGNO_OK_FOR_BASE_P(REGNO) \
   (GENERAL_OR_AP_REGISTER_P (REGNO) \
    || GENERAL_OR_AP_REGISTER_P (reg_renumber[(REGNO)]))
 #define REGNO_OK_FOR_INDEX_P(REGNO) \
-  (TARGET_SHMEDIA \
-   ? (GENERAL_REGISTER_P (REGNO) \
-      || GENERAL_REGISTER_P ((unsigned) reg_renumber[(REGNO)])) \
-   : (REGNO) == R0_REG || (unsigned) reg_renumber[(REGNO)] == R0_REG)
+  ((REGNO) == R0_REG || (unsigned) reg_renumber[(REGNO)] == R0_REG)
+
+/* True if SYMBOL + OFFSET constants must refer to something within
+   SYMBOL's section.  */
+#define SH_OFFSETS_MUST_BE_WITHIN_SECTIONS_P TARGET_FDPIC
 
 /* Maximum number of registers that can appear in a valid memory
    address.  */
-
 #define MAX_REGS_PER_ADDRESS 2
 
 /* Recognize any constant value that is a valid address.  */
-
 #define CONSTANT_ADDRESS_P(X)	(GET_CODE (X) == LABEL_REF)
 
-/* Nonzero if the constant value X is a legitimate general operand.  */
-/* can_store_by_pieces constructs VOIDmode CONST_DOUBLEs.  */
-
-#define LEGITIMATE_CONSTANT_P(X) \
-  (TARGET_SHMEDIA							\
-   ? ((GET_MODE (X) != DFmode						\
-       && GET_MODE_CLASS (GET_MODE (X)) != MODE_VECTOR_FLOAT)		\
-      || (X) == CONST0_RTX (GET_MODE (X))				\
-      || ! TARGET_SHMEDIA_FPU						\
-      || TARGET_SHMEDIA64)						\
-   : (GET_CODE (X) != CONST_DOUBLE					\
-      || GET_MODE (X) == DFmode || GET_MODE (X) == SFmode		\
-      || GET_MODE (X) == DImode || GET_MODE (X) == VOIDmode))
-
 /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx
    and check its validity for a certain class.
    The suitable hard regs are always accepted and all pseudo regs
@@ -1804,19 +1350,17 @@
 
 /* Nonzero if X is a reg that can be used as an index.  */
 #define REG_OK_FOR_INDEX_P(X, STRICT)			\
-  ((TARGET_SHMEDIA ? GENERAL_REGISTER_P (REGNO (X))	\
-    : REGNO (X) == R0_REG)				\
+  ((REGNO (X) == R0_REG)				\
    || (!STRICT && REGNO (X) >= FIRST_PSEUDO_REGISTER))
 
 /* Nonzero if X/OFFSET is a reg that can be used as an index.  */
 #define SUBREG_OK_FOR_INDEX_P(X, OFFSET, STRICT)	\
-  ((TARGET_SHMEDIA ? GENERAL_REGISTER_P (REGNO (X))	\
-    : REGNO (X) == R0_REG && OFFSET == 0)		\
+  ((REGNO (X) == R0_REG && OFFSET == 0)			\
    || (!STRICT && REGNO (X) >= FIRST_PSEUDO_REGISTER))
 
 /* Macros for extra constraints.  */
 
-#define IS_PC_RELATIVE_LOAD_ADDR_P(OP)                          	\
+#define IS_PC_RELATIVE_LOAD_ADDR_P(OP)					\
   ((GET_CODE ((OP)) == LABEL_REF)					\
    || (GET_CODE ((OP)) == CONST						\
        && GET_CODE (XEXP ((OP), 0)) == PLUS				\
@@ -1825,20 +1369,13 @@
 
 #define IS_NON_EXPLICIT_CONSTANT_P(OP)					\
   (CONSTANT_P (OP)							\
-   && !CONST_INT_P (OP)					\
+   && !CONST_INT_P (OP)							\
    && GET_CODE (OP) != CONST_DOUBLE					\
    && (!flag_pic							\
        || (LEGITIMATE_PIC_OPERAND_P (OP)				\
 	   && !PIC_ADDR_P (OP)						\
 	   && GET_CODE (OP) != LABEL_REF)))
 
-/* Check whether OP is a datalabel unspec.  */
-#define DATALABEL_REF_NO_CONST_P(OP) \
-  (GET_CODE (OP) == UNSPEC \
-   && XINT ((OP), 1) == UNSPEC_DATALABEL \
-   && XVECLEN ((OP), 0) == 1 \
-   && GET_CODE (XVECEXP ((OP), 0, 0)) == LABEL_REF)
-
 #define GOT_ENTRY_P(OP) \
   (GET_CODE (OP) == CONST && GET_CODE (XEXP ((OP), 0)) == UNSPEC \
    && XINT (XEXP ((OP), 0), 1) == UNSPEC_GOT)
@@ -1854,7 +1391,7 @@
   (GET_CODE (OP) == CONST \
    && (UNSPEC_GOTOFF_P (XEXP ((OP), 0)) \
        || (GET_CODE (XEXP ((OP), 0)) == PLUS \
-           && UNSPEC_GOTOFF_P (XEXP (XEXP ((OP), 0), 0)) \
+	   && UNSPEC_GOTOFF_P (XEXP (XEXP ((OP), 0), 0)) \
 	   && CONST_INT_P (XEXP (XEXP ((OP), 0), 1)))))
 
 #define PIC_ADDR_P(OP) \
@@ -1870,29 +1407,19 @@
   (GET_CODE (OP) == LABEL_REF || GET_CODE (OP) == SYMBOL_REF \
    || (GET_CODE (OP) == CONST \
        && (GET_CODE (XEXP ((OP), 0)) == LABEL_REF \
-	   || GET_CODE (XEXP ((OP), 0)) == SYMBOL_REF \
-	   || DATALABEL_REF_NO_CONST_P (XEXP ((OP), 0)))) \
+	   || GET_CODE (XEXP ((OP), 0)) == SYMBOL_REF)) \
    || (GET_CODE (OP) == CONST && GET_CODE (XEXP ((OP), 0)) == PLUS \
        && (GET_CODE (XEXP (XEXP ((OP), 0), 0)) == SYMBOL_REF \
-	   || GET_CODE (XEXP (XEXP ((OP), 0), 0)) == LABEL_REF \
-	   || DATALABEL_REF_NO_CONST_P (XEXP (XEXP ((OP), 0), 0))) \
+	   || GET_CODE (XEXP (XEXP ((OP), 0), 0)) == LABEL_REF) \
        && CONST_INT_P (XEXP (XEXP ((OP), 0), 1))))
 
 #define PIC_REFERENCE_P(OP) \
   (GOT_ENTRY_P (OP) || GOTPLT_ENTRY_P (OP) \
    || GOTOFF_P (OP) || PIC_ADDR_P (OP))
 
-#define MOVI_SHORI_BASE_OPERAND_P(OP) \
-  (flag_pic \
-   ? (GOT_ENTRY_P (OP) || GOTPLT_ENTRY_P (OP)  || GOTOFF_P (OP) \
-      || PCREL_SYMOFF_P (OP)) \
-   : NON_PIC_REFERENCE_P (OP))
-
 #define MAYBE_BASE_REGISTER_RTX_P(X, STRICT)			\
   ((REG_P (X) && REG_OK_FOR_BASE_P (X, STRICT))	\
    || (GET_CODE (X) == SUBREG					\
-       && TRULY_NOOP_TRUNCATION (GET_MODE_BITSIZE (GET_MODE ((X))),	\
-				 GET_MODE_BITSIZE (GET_MODE (SUBREG_REG (X)))) \
        && REG_P (SUBREG_REG (X))			\
        && REG_OK_FOR_BASE_P (SUBREG_REG (X), STRICT)))
 
@@ -1902,8 +1429,6 @@
 #define MAYBE_INDEX_REGISTER_RTX_P(X, STRICT)				\
   ((REG_P (X) && REG_OK_FOR_INDEX_P (X, STRICT))	\
    || (GET_CODE (X) == SUBREG					\
-       && TRULY_NOOP_TRUNCATION (GET_MODE_BITSIZE (GET_MODE ((X))), \
-				 GET_MODE_BITSIZE (GET_MODE (SUBREG_REG (X)))) \
        && REG_P (SUBREG_REG (X))		\
        && SUBREG_OK_FOR_INDEX_P (SUBREG_REG (X), SUBREG_BYTE (X), STRICT)))
 
@@ -1915,19 +1440,10 @@
 #define INDEX_REGISTER_RTX_P(X) MAYBE_INDEX_REGISTER_RTX_P(X, false)
 #endif
 
-#define ALLOW_INDEXED_ADDRESS \
-  ((!TARGET_SHMEDIA32 && !TARGET_SHCOMPACT) || TARGET_ALLOW_INDEXED_ADDRESS)
-
-#define GO_IF_LEGITIMATE_INDEX(MODE, OP, WIN)	\
-  do {						\
-    if (sh_legitimate_index_p ((MODE), (OP)))	\
-      goto WIN;					\
-  } while (0)
 
 /* A C compound statement that attempts to replace X, which is an address
    that needs reloading, with a valid memory address for an operand of
    mode MODE.  WIN is a C statement label elsewhere in the code.  */
-
 #define LEGITIMIZE_RELOAD_ADDRESS(X,MODE,OPNUM,TYPE,IND_LEVELS,WIN)	\
   do {									\
     if (sh_legitimize_reload_address (&(X), (MODE), (OPNUM), (TYPE)))	\
@@ -1957,16 +1473,16 @@
 
 /* Since the SH2e has only `float' support, it is desirable to make all
    floating point types equivalent to `float'.  */
-#define DOUBLE_TYPE_SIZE ((TARGET_SH2E && ! TARGET_SH4 && ! TARGET_SH2A_DOUBLE) ? 32 : 64)
+#define DOUBLE_TYPE_SIZE (TARGET_FPU_SINGLE_ONLY ? 32 : 64)
 
 /* 'char' is signed by default.  */
 #define DEFAULT_SIGNED_CHAR  1
 
 /* The type of size_t unsigned int.  */
-#define SIZE_TYPE (TARGET_SH5 ? "long unsigned int" : "unsigned int")
+#define SIZE_TYPE ("unsigned int")
 
 #undef  PTRDIFF_TYPE
-#define PTRDIFF_TYPE (TARGET_SH5 ? "long int" : "int")
+#define PTRDIFF_TYPE ("int")
 
 #define WCHAR_TYPE "short unsigned int"
 #define WCHAR_TYPE_SIZE 16
@@ -1975,7 +1491,7 @@
 
 /* Max number of bytes we can move from memory to memory
    in one reasonably fast instruction.  */
-#define MOVE_MAX (TARGET_SHMEDIA ? 8 : 4)
+#define MOVE_MAX (4)
 
 /* Maximum value possibly taken by MOVE_MAX.  Must be defined whenever
    MOVE_MAX is not a compile-time constant.  */
@@ -1983,44 +1499,49 @@
 
 /* Max number of bytes we want move_by_pieces to be able to copy
    efficiently.  */
-#define MOVE_MAX_PIECES (TARGET_SH4 || TARGET_SHMEDIA ? 8 : 4)
+#define MOVE_MAX_PIECES (TARGET_SH4 ? 8 : 4)
 
 /* Define if operations between registers always perform the operation
    on the full register even if a narrower mode is specified.  */
-#define WORD_REGISTER_OPERATIONS
+#define WORD_REGISTER_OPERATIONS 1
 
 /* Define if loading in MODE, an integral mode narrower than BITS_PER_WORD
    will either zero-extend or sign-extend.  The value of this macro should
    be the code that says which one of the two operations is implicitly
    done, UNKNOWN if none.  */
-/* For SHmedia, we can truncate to QImode easier using zero extension.  */
-/* FP registers can load SImode values, but don't implicitly sign-extend
-   them to DImode.  */
-#define LOAD_EXTEND_OP(MODE) \
- (((MODE) == QImode  && TARGET_SHMEDIA) ? ZERO_EXTEND \
-  : (MODE) != SImode ? SIGN_EXTEND : UNKNOWN)
+#define LOAD_EXTEND_OP(MODE) ((MODE) != SImode ? SIGN_EXTEND : UNKNOWN)
 
 /* Define if loading short immediate values into registers sign extends.  */
-#define SHORT_IMMEDIATES_SIGN_EXTEND
+#define SHORT_IMMEDIATES_SIGN_EXTEND 1
 
 /* Nonzero if access to memory by bytes is no faster than for words.  */
 #define SLOW_BYTE_ACCESS 1
 
-/* Immediate shift counts are truncated by the output routines (or was it
-   the assembler?).  Shift counts in a register are truncated by SH.  Note
-   that the native compiler puts too large (> 32) immediate shift counts
-   into a register and shifts by the register, letting the SH decide what
-   to do instead of doing that itself.  */
-/* ??? The library routines in lib1funcs.asm truncate the shift count.
-   However, the SH3 has hardware shifts that do not truncate exactly as gcc
-   expects - the sign bit is significant - so it appears that we need to
-   leave this zero for correct SH3 code.  */
-#define SHIFT_COUNT_TRUNCATED (! TARGET_SH3 && ! TARGET_SH2A)
+/* Nonzero if the target supports dynamic shift instructions
+   like shad and shld.  */
+#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A)
+
+/* The cost of using the dynamic shift insns (shad, shld) are the same
+   if they are available.  If they are not available a library function will
+   be emitted instead, which is more expensive.  */
+#define SH_DYNAMIC_SHIFT_COST (TARGET_DYNSHIFT ? 1 : 20)
 
-/* All integers have the same format so truncation is easy.  */
-/* But SHmedia must sign-extend DImode when truncating to SImode.  */
-#define TRULY_NOOP_TRUNCATION(OUTPREC,INPREC) \
- (!TARGET_SHMEDIA || (INPREC) < 64 || (OUTPREC) >= 64)
+/* Defining SHIFT_COUNT_TRUNCATED tells the combine pass that code like
+   (X << (Y % 32)) for register X, Y is equivalent to (X << Y).
+   This is not generally true when hardware dynamic shifts (shad, shld) are
+   used, because they check the sign bit _before_ the modulo op.  The sign
+   bit determines whether it is a left shift or a right shift:
+     if (Y < 0)
+       return X << (Y & 31);
+     else
+       return X >> (-Y) & 31);
+ 
+   The dynamic shift library routines in lib1funcs.S do not use the sign bit
+   like the hardware dynamic shifts and truncate the shift count to 31.
+   We define SHIFT_COUNT_TRUNCATED to 0 and express the implied shift count
+   truncation in the library function call patterns, as this gives slightly
+   more compact code.  */
+#define SHIFT_COUNT_TRUNCATED (0)
 
 /* Define this if addresses of constant functions
    shouldn't be put through pseudo regs where they can be cse'd.
@@ -2029,7 +1550,7 @@
 /*#define NO_FUNCTION_CSE 1*/
 
 /* The machine modes of pointers and functions.  */
-#define Pmode  (TARGET_SHMEDIA64 ? DImode : SImode)
+#define Pmode  (SImode)
 #define FUNCTION_MODE  Pmode
 
 /* The multiply insn on the SH1 and the divide insns on the SH1 and SH2
@@ -2047,14 +1568,14 @@
    in particular.  */
 
 #define INSN_SETS_ARE_DELAYED(X) 		\
-  ((NONJUMP_INSN_P (X)			\
+  ((NONJUMP_INSN_P (X)				\
     && GET_CODE (PATTERN (X)) != SEQUENCE	\
     && GET_CODE (PATTERN (X)) != USE		\
     && GET_CODE (PATTERN (X)) != CLOBBER	\
     && get_attr_is_sfunc (X)))
 
 #define INSN_REFERENCES_ARE_DELAYED(X) 		\
-  ((NONJUMP_INSN_P (X)			\
+  ((NONJUMP_INSN_P (X)				\
     && GET_CODE (PATTERN (X)) != SEQUENCE	\
     && GET_CODE (PATTERN (X)) != USE		\
     && GET_CODE (PATTERN (X)) != CLOBBER	\
@@ -2069,8 +1590,7 @@
 	((! nonpic_symbol_mentioned_p (X)			\
 	  && (GET_CODE (X) != SYMBOL_REF			\
 	      || ! CONSTANT_POOL_ADDRESS_P (X)			\
-	      || ! nonpic_symbol_mentioned_p (get_pool_constant (X)))) \
-	 || (TARGET_SHMEDIA && GET_CODE (X) == LABEL_REF))
+	      || ! nonpic_symbol_mentioned_p (get_pool_constant (X)))))
 
 #define SYMBOLIC_CONST_P(X)	\
 ((GET_CODE (X) == SYMBOL_REF || GET_CODE (X) == LABEL_REF)	\
@@ -2082,26 +1602,21 @@
 /* If SECONDARY*_RELOAD_CLASS says something about the src/dst pair, regclass
    uses this information.  Hence, the general register <-> floating point
    register information here is not used for SFmode.  */
-
 #define REGCLASS_HAS_GENERAL_REG(CLASS) \
-  ((CLASS) == GENERAL_REGS || (CLASS) == R0_REGS \
-    || (! TARGET_SHMEDIA && (CLASS) == SIBCALL_REGS))
+  ((CLASS) == GENERAL_REGS || (CLASS) == R0_REGS || (CLASS) == NON_SP_REGS \
+    || ((CLASS) == SIBCALL_REGS))
 
 #define REGCLASS_HAS_FP_REG(CLASS) \
   ((CLASS) == FP0_REGS || (CLASS) == FP_REGS \
-   || (CLASS) == DF_REGS || (CLASS) == DF_HI_REGS)
+   || (CLASS) == DF_REGS)
 
 /* ??? Perhaps make MEMORY_MOVE_COST depend on compiler option?  This
    would be so that people with slow memory systems could generate
    different code that does fewer memory accesses.  */
 
 /* A C expression for the cost of a branch instruction.  A value of 1
-   is the default; other values are interpreted relative to that.
-   The SH1 does not have delay slots, hence we get a pipeline stall
-   at every branch.  The SH4 is superscalar, so the single delay slot
-   is not sufficient to keep both pipelines filled.  */
-#define BRANCH_COST(speed_p, predictable_p) \
-	(TARGET_SH5 ? 1 : ! TARGET_SH2 || TARGET_HARD_SH4 ? 2 : 1)
+   is the default; other values are interpreted relative to that.  */
+#define BRANCH_COST(speed_p, predictable_p) sh_branch_cost
 
 /* Assembler output control.  */
 
@@ -2116,40 +1631,19 @@
 #define SET_ASM_OP		"\t.set\t"
 
 /* How to change between sections.  */
-
-#define TEXT_SECTION_ASM_OP  		(TARGET_SHMEDIA32 ? "\t.section\t.text..SHmedia32,\"ax\"" : "\t.text")
-#define DATA_SECTION_ASM_OP  		"\t.data"
+#define TEXT_SECTION_ASM_OP	"\t.text"
+#define DATA_SECTION_ASM_OP	"\t.data"
 
 #if defined CRT_BEGIN || defined CRT_END
 /* Arrange for TEXT_SECTION_ASM_OP to be a compile-time constant.  */
-# undef TEXT_SECTION_ASM_OP
-# if __SHMEDIA__ == 1 && __SH5__ == 32
-#  define TEXT_SECTION_ASM_OP "\t.section\t.text..SHmedia32,\"ax\""
-# else
-#  define TEXT_SECTION_ASM_OP "\t.text"
-# endif
+#undef TEXT_SECTION_ASM_OP
+#define TEXT_SECTION_ASM_OP "\t.text"
 #endif
 
-
-/* If defined, a C expression whose value is a string containing the
-   assembler operation to identify the following data as
-   uninitialized global data.  If not defined, and neither
-   `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined,
-   uninitialized global data will be output in the data section if
-   `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
-   used.  */
 #ifndef BSS_SECTION_ASM_OP
 #define BSS_SECTION_ASM_OP	"\t.section\t.bss"
 #endif
 
-/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a
-   separate, explicit argument.  If you define this macro, it is used
-   in place of `ASM_OUTPUT_BSS', and gives you more flexibility in
-   handling the required alignment of the variable.  The alignment is
-   specified as the number of bits.
-
-   Try to use function `asm_output_aligned_bss' defined in file
-   `varasm.c' when defining this macro.  */
 #ifndef ASM_OUTPUT_ALIGNED_BSS
 #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
   asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
@@ -2187,24 +1681,12 @@
 
 #define ASM_OUTPUT_REG_PUSH(file, v) \
 {							\
-  if (TARGET_SHMEDIA)					\
-    {							\
-      fprintf ((file), "\taddi.l\tr15,-8,r15\n");	\
-      fprintf ((file), "\tst.q\tr15,0,r%d\n", (v));	\
-    }							\
-  else							\
-    fprintf ((file), "\tmov.l\tr%d,@-r15\n", (v));	\
+  fprintf ((file), "\tmov.l\tr%d,@-r15\n", (v));	\
 }
 
 #define ASM_OUTPUT_REG_POP(file, v) \
 {							\
-  if (TARGET_SHMEDIA)					\
-    {							\
-      fprintf ((file), "\tld.q\tr15,0,r%d\n", (v));	\
-      fprintf ((file), "\taddi.l\tr15,8,r15\n");	\
-    }							\
-  else							\
-    fprintf ((file), "\tmov.l\t@r15+,r%d\n", (v));	\
+  fprintf ((file), "\tmov.l\t@r15+,r%d\n", (v));	\
 }
 
 /* DBX register number for a given compiler register number.  */
@@ -2214,57 +1696,33 @@
    register exists, so we should return -1 for invalid register numbers.  */
 #define DBX_REGISTER_NUMBER(REGNO) SH_DBX_REGISTER_NUMBER (REGNO)
 
-/* SHcompact PR_REG used to use the encoding 241, and SHcompact FP registers
-   used to use the encodings 245..260, but that doesn't make sense:
-   PR_REG and PR_MEDIA_REG are actually the same register, and likewise
-   the FP registers stay the same when switching between compact and media
-   mode.  Hence, we also need to use the same dwarf frame columns.
-   Likewise, we need to support unwind information for SHmedia registers
-   even in compact code.  */
 #define SH_DBX_REGISTER_NUMBER(REGNO) \
   (IN_RANGE ((REGNO), \
 	     (unsigned HOST_WIDE_INT) FIRST_GENERAL_REG, \
-	     FIRST_GENERAL_REG + (TARGET_SH5 ? 63U :15U)) \
+	     FIRST_GENERAL_REG + 15U) \
    ? ((unsigned) (REGNO) - FIRST_GENERAL_REG) \
-  : ((int) (REGNO) >= FIRST_FP_REG \
+   : ((int) (REGNO) >= FIRST_FP_REG \
      && ((int) (REGNO) \
-	 <= (FIRST_FP_REG + \
-	     ((TARGET_SH5 && TARGET_FPU_ANY) ? 63 : TARGET_SH2E ? 15 : -1)))) \
-   ? ((unsigned) (REGNO) - FIRST_FP_REG \
-      + (TARGET_SH5 ? 77 : 25)) \
+	 <= (FIRST_FP_REG + (TARGET_SH2E ? 15 : -1)))) \
+   ? ((unsigned) (REGNO) - FIRST_FP_REG + 25) \
    : XD_REGISTER_P (REGNO) \
-   ? ((unsigned) (REGNO) - FIRST_XD_REG + (TARGET_SH5 ? 289 : 87)) \
-   : TARGET_REGISTER_P (REGNO) \
-   ? ((unsigned) (REGNO) - FIRST_TARGET_REG + 68) \
+   ? ((unsigned) (REGNO) - FIRST_XD_REG + 87) \
    : (REGNO) == PR_REG \
-   ? (TARGET_SH5 ? 18 : 17) \
-   : (REGNO) == PR_MEDIA_REG \
-   ? (TARGET_SH5 ? 18 : (unsigned) -1) \
+   ? (17) \
    : (REGNO) == GBR_REG \
-   ? (TARGET_SH5 ? 238 : 18) \
+   ? (18) \
    : (REGNO) == MACH_REG \
-   ? (TARGET_SH5 ? 239 : 20) \
+   ? (20) \
    : (REGNO) == MACL_REG \
-   ? (TARGET_SH5 ? 240 : 21) \
+   ? (21) \
    : (REGNO) == T_REG \
-   ? (TARGET_SH5 ? 242 : 22) \
+   ? (22) \
    : (REGNO) == FPUL_REG \
-   ? (TARGET_SH5 ? 244 : 23) \
+   ? (23) \
    : (REGNO) == FPSCR_REG \
-   ? (TARGET_SH5 ? 243 : 24) \
+   ? (24) \
    : (unsigned) -1)
 
-/* This is how to output a reference to a symbol_ref.  On SH5,
-   references to non-code symbols must be preceded by `datalabel'.  */
-#define ASM_OUTPUT_SYMBOL_REF(FILE,SYM)			\
-  do 							\
-    {							\
-      if (TARGET_SH5 && !SYMBOL_REF_FUNCTION_P (SYM))	\
-	fputs ("datalabel ", (FILE));			\
-      assemble_name ((FILE), XSTR ((SYM), 0));		\
-    }							\
-  while (0)
-
 /* This is how to output an assembler line
    that says to advance the location counter
    to a multiple of 2**LOG bytes.  */
@@ -2276,38 +1734,19 @@
 /* Globalizing directive for a label.  */
 #define GLOBAL_ASM_OP "\t.global\t"
 
-/* #define ASM_OUTPUT_CASE_END(STREAM,NUM,TABLE)	    */
+/* #define ASM_OUTPUT_CASE_END(STREAM,NUM,TABLE)  */
 
 /* Output a relative address table.  */
-
-#define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM,BODY,VALUE,REL)  		\
+#define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM,BODY,VALUE,REL)			\
   switch (GET_MODE (BODY))						\
     {									\
-    case SImode:							\
-      if (TARGET_SH5)							\
-	{								\
-	  asm_fprintf ((STREAM), "\t.long\t%LL%d-datalabel %LL%d\n",	\
-		       (VALUE), (REL));					\
-	  break;							\
-	}								\
+    case E_SImode:							\
       asm_fprintf ((STREAM), "\t.long\t%LL%d-%LL%d\n", (VALUE),(REL));	\
       break;								\
-    case HImode:							\
-      if (TARGET_SH5)							\
-	{								\
-	  asm_fprintf ((STREAM), "\t.word\t%LL%d-datalabel %LL%d\n",	\
-		       (VALUE), (REL));					\
-	  break;							\
-	}								\
+    case E_HImode:							\
       asm_fprintf ((STREAM), "\t.word\t%LL%d-%LL%d\n", (VALUE),(REL));	\
       break;								\
-    case QImode:							\
-      if (TARGET_SH5)							\
-	{								\
-	  asm_fprintf ((STREAM), "\t.byte\t%LL%d-datalabel %LL%d\n",	\
-		       (VALUE), (REL));					\
-	  break;							\
-	}								\
+    case E_QImode:							\
       asm_fprintf ((STREAM), "\t.byte\t%LL%d-%LL%d\n", (VALUE),(REL));	\
       break;								\
     default:								\
@@ -2315,7 +1754,6 @@
     }
 
 /* Output an absolute table element.  */
-
 #define ASM_OUTPUT_ADDR_VEC_ELT(STREAM,VALUE)  				\
   if (! optimize || TARGET_BIGTABLE)					\
     asm_fprintf ((STREAM), "\t.long\t%LL%d\n", (VALUE)); 		\
@@ -2333,17 +1771,11 @@
    The contents of this vector are what will be used to convert the insn
    template into assembler code, so you can change the assembler output
    by changing the contents of the vector.  */
-
 #define FINAL_PRESCAN_INSN(INSN, OPVEC, NOPERANDS) \
   final_prescan_insn ((INSN), (OPVEC), (NOPERANDS))
 
-
-extern struct rtx_def *sh_compare_op0;
-extern struct rtx_def *sh_compare_op1;
-
 /* Which processor to schedule for.  The elements of the enumeration must
    match exactly the cpu attribute in the sh.md file.  */
-
 enum processor_type {
   PROCESSOR_SH1,
   PROCESSOR_SH2,
@@ -2352,8 +1784,7 @@
   PROCESSOR_SH3,
   PROCESSOR_SH3E,
   PROCESSOR_SH4,
-  PROCESSOR_SH4A,
-  PROCESSOR_SH5
+  PROCESSOR_SH4A
 };
 
 #define sh_cpu_attr ((enum attr_cpu)sh_cpu)
@@ -2381,15 +1812,11 @@
 extern tree sh_deferred_function_attributes;
 extern tree *sh_deferred_function_attributes_tail;
 
-/* Set when processing a function with interrupt attribute.  */
-
-extern int current_function_interrupt;
 
 
 /* Instructions with unfilled delay slots take up an
    extra two bytes for the nop in the delay slot.
    sh-dsp parallel processing insns are four bytes long.  */
-
 #define ADJUST_INSN_LENGTH(X, LENGTH)				\
   (LENGTH) += sh_insn_length_adjustment (X);
 
@@ -2405,25 +1832,17 @@
 #define PROMOTE_MODE(MODE, UNSIGNEDP, TYPE) \
   if (GET_MODE_CLASS (MODE) == MODE_INT			\
       && GET_MODE_SIZE (MODE) < 4/* ! UNITS_PER_WORD */)\
-    (UNSIGNEDP) = ((MODE) == SImode ? 0 : (UNSIGNEDP)),	\
-    (MODE) = (TARGET_SH1 ? SImode \
-	      : TARGET_SHMEDIA32 ? SImode : DImode);
+    (UNSIGNEDP) = ((MODE) == SImode ? 0 : (UNSIGNEDP)),	(MODE) = SImode;
 
-#define MAX_FIXED_MODE_SIZE (TARGET_SH5 ? 128 : 64)
-
-#define SIDI_OFF (TARGET_LITTLE_ENDIAN ? 0 : 4)
+#define MAX_FIXED_MODE_SIZE (64)
 
 /* Better to allocate once the maximum space for outgoing args in the
    prologue rather than duplicate around each call.  */
 #define ACCUMULATE_OUTGOING_ARGS TARGET_ACCUMULATE_OUTGOING_ARGS
 
-#define SH_DYNAMIC_SHIFT_COST \
-  (TARGET_HARD_SH4 ? 1 : TARGET_SH3 ? (optimize_size ? 1 : 2) : 20)
-
-
 #define NUM_MODES_FOR_MODE_SWITCHING { FP_MODE_NONE }
 
-#define OPTIMIZE_MODE_SWITCHING(ENTITY) (TARGET_SH4 || TARGET_SH2A_DOUBLE)
+#define OPTIMIZE_MODE_SWITCHING(ENTITY) (TARGET_FPU_DOUBLE)
 
 #define ACTUAL_NORMAL_MODE(ENTITY) \
   (TARGET_FPU_SINGLE ? FP_MODE_SINGLE : FP_MODE_DOUBLE)
@@ -2433,40 +1852,11 @@
    ? (TARGET_FMOVD ? FP_MODE_DOUBLE : FP_MODE_NONE) \
    : ACTUAL_NORMAL_MODE (ENTITY))
 
-#define MODE_ENTRY(ENTITY) NORMAL_MODE (ENTITY)
-
-#define MODE_EXIT(ENTITY) \
-  (sh_cfun_attr_renesas_p () ? FP_MODE_NONE : NORMAL_MODE (ENTITY))
-
-#define EPILOGUE_USES(REGNO)       ((TARGET_SH2E || TARGET_SH4)		\
-				    && (REGNO) == FPSCR_REG)
-
-#define MODE_NEEDED(ENTITY, INSN)					\
-  (recog_memoized (INSN) >= 0						\
-   ? get_attr_fp_mode (INSN)						\
-   : FP_MODE_NONE)
+#define EPILOGUE_USES(REGNO) (TARGET_FPU_ANY && REGNO == FPSCR_REG)
 
-#define MODE_AFTER(MODE, INSN)                  \
-     (TARGET_HITACHI				\
-      && recog_memoized (INSN) >= 0		\
-      && get_attr_fp_set (INSN) != FP_SET_NONE  \
-      ? (int) get_attr_fp_set (INSN)            \
-      : (MODE))
-
-#define MODE_PRIORITY_TO_MODE(ENTITY, N) \
-  ((TARGET_FPU_SINGLE != 0) ^ (N) ? FP_MODE_SINGLE : FP_MODE_DOUBLE)
+#define DWARF_FRAME_RETURN_COLUMN (DWARF_FRAME_REGNUM (PR_REG))
 
-#define EMIT_MODE_SET(ENTITY, MODE, HARD_REGS_LIVE) \
-  fpscr_set_from_mem ((MODE), (HARD_REGS_LIVE))
-
-#define MD_CAN_REDIRECT_BRANCH(INSN, SEQ) \
-  sh_can_redirect_branch ((INSN), (SEQ))
-
-#define DWARF_FRAME_RETURN_COLUMN \
-  (TARGET_SH5 ? DWARF_FRAME_REGNUM (PR_MEDIA_REG) : DWARF_FRAME_REGNUM (PR_REG))
-
-#define EH_RETURN_DATA_REGNO(N)	\
-  ((N) < 4 ? (N) + (TARGET_SH5 ? 2U : 4U) : INVALID_REGNUM)
+#define EH_RETURN_DATA_REGNO(N)	((N) < 4 ? (N) + 4U : INVALID_REGNUM)
 
 #define EH_RETURN_STACKADJ_REGNO STATIC_CHAIN_REGNUM
 #define EH_RETURN_STACKADJ_RTX	gen_rtx_REG (Pmode, EH_RETURN_STACKADJ_REGNO)
@@ -2474,9 +1864,11 @@
 /* We have to distinguish between code and data, so that we apply
    datalabel where and only where appropriate.  Use sdataN for data.  */
 #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL) \
- ((flag_pic && (GLOBAL) ? DW_EH_PE_indirect : 0) \
-  | (flag_pic ? DW_EH_PE_pcrel : DW_EH_PE_absptr) \
-  | ((CODE) ? 0 : (TARGET_SHMEDIA64 ? DW_EH_PE_sdata8 : DW_EH_PE_sdata4)))
+  ((TARGET_FDPIC \
+    ? ((GLOBAL) ? DW_EH_PE_indirect | DW_EH_PE_datarel : DW_EH_PE_pcrel) \
+    : ((flag_pic && (GLOBAL) ? DW_EH_PE_indirect : 0) \
+       | (flag_pic ? DW_EH_PE_pcrel : DW_EH_PE_absptr))) \
+   | ((CODE) ? 0 : DW_EH_PE_sdata4))
 
 /* Handle special EH pointer encodings.  Absolute, pc-relative, and
    indirect are handled automatically.  */
@@ -2489,9 +1881,20 @@
 	SYMBOL_REF_FLAGS (ADDR) |= SYMBOL_FLAG_FUNCTION; \
 	if (0) goto DONE; \
       } \
+    if (TARGET_FDPIC \
+	&& ((ENCODING) & 0xf0) == (DW_EH_PE_indirect | DW_EH_PE_datarel)) \
+      { \
+	fputs ("\t.ualong ", FILE); \
+	output_addr_const (FILE, ADDR); \
+	if (GET_CODE (ADDR) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (ADDR)) \
+	  fputs ("@GOTFUNCDESC", FILE); \
+	else \
+	  fputs ("@GOT", FILE); \
+	goto DONE; \
+      } \
   } while (0)
 
-#if (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__
+#if (defined CRT_BEGIN || defined CRT_END)
 /* SH constant pool breaks the devices in crtstuff.c to control section
    in where code resides.  We have to write it as asm code.  */
 #define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC) \
@@ -2503,9 +1906,6 @@
 0:	.p2align 2\n\
 1:	.long	" USER_LABEL_PREFIX #FUNC " - 0b\n\
 2:\n" TEXT_SECTION_ASM_OP);
-#endif /* (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__ */
-
-/* FIXME: middle-end support for highpart optimizations is missing.  */
-#define high_life_started reload_in_progress
+#endif /* (defined CRT_BEGIN || defined CRT_END) */
 
 #endif /* ! GCC_SH_H */