diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d8433d234a..d25f3923204 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-12  Christian Bruel  <christian.bruel@st.com>
+	* sh.h (SH_DBX_REGISTER_NUMBER): Added fpscr, fixed sr/gbr regs.
+	* linux-unwind.h (SH_DWARF_FRAME_GBR): fixed. 
+	
 2007-09-12  Ira Rosen  <irar@il.ibm.com>
 
 	* tree-vect-transform.c (vect_get_slp_defs): Don't build a vector
diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
index edc15d9d699..3a3e9aa392d 100644
--- a/gcc/config/sh/linux-unwind.h
+++ b/gcc/config/sh/linux-unwind.h
@@ -45,7 +45,7 @@ Boston, MA 02110-1301, USA.  */
 #define SH_DWARF_FRAME_FP0	25
 #define SH_DWARF_FRAME_XD0	87
 #define SH_DWARF_FRAME_PR	17
-#define SH_DWARF_FRAME_GBR	19
+#define SH_DWARF_FRAME_GBR	18
 #define SH_DWARF_FRAME_MACH	20
 #define SH_DWARF_FRAME_MACL	21
 #define SH_DWARF_FRAME_PC	16
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 0583a8a447d..d5329d9c6e1 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -2973,16 +2973,18 @@ struct sh_args {
    ? (TARGET_SH5 ? 18 : 17) \
    : (REGNO) == PR_MEDIA_REG \
    ? (TARGET_SH5 ? 18 : (unsigned) -1) \
-   : (REGNO) == T_REG \
-   ? (TARGET_SH5 ? 242 : 18) \
    : (REGNO) == GBR_REG \
-   ? (TARGET_SH5 ? 238 : 19) \
+   ? (TARGET_SH5 ? 238 : 18) \
    : (REGNO) == MACH_REG \
    ? (TARGET_SH5 ? 239 : 20) \
    : (REGNO) == MACL_REG \
    ? (TARGET_SH5 ? 240 : 21) \
+   : (REGNO) == T_REG \
+   ? (TARGET_SH5 ? 242 : 22) \
    : (REGNO) == FPUL_REG \
    ? (TARGET_SH5 ? 244 : 23) \
+   : (REGNO) == FPSCR_REG \
+   ? (TARGET_SH5 ? 243 : 24) \
    : (unsigned) -1)
 
 /* This is how to output a reference to a symbol_ref.  On SH5,