Merge from trunk revision f35be1268c996d993ab0b4ff329734d467474445.

3 files changed, 2 insertions, 40 deletions

diff --git a/gcc/config/m32c/m32c.cc b/gcc/config/m32c/m32c.cc
index 5a19faa..26601ab 100644
--- a/gcc/config/m32c/m32c.cc
+++ b/gcc/config/m32c/m32c.cc
@@ -1013,7 +1013,7 @@ m32c_eh_return_stackadj_rtx (void)
 
 /* Registers That Address the Stack Frame */
 
-/* Implements DWARF_FRAME_REGNUM and DBX_REGISTER_NUMBER.  Note that
+/* Implements DWARF_FRAME_REGNUM and DEBUGGER_REGNO.  Note that
    the original spec called for dwarf numbers to vary with register
    width as well, for example, r0l, r0, and r2r0 would each have
    different dwarf numbers.  GCC doesn't support this, and we don't do
diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h
index af99103..a9b61ac 100644
--- a/gcc/config/m32c/m32c.h
+++ b/gcc/config/m32c/m32c.h
@@ -452,7 +452,7 @@ enum reg_class
 
 #define DWARF_FRAME_REGISTERS 20
 #define DWARF_FRAME_REGNUM(N) m32c_dwarf_frame_regnum (N)
-#define DBX_REGISTER_NUMBER(N) m32c_dwarf_frame_regnum (N)
+#define DEBUGGER_REGNO(N) m32c_dwarf_frame_regnum (N)
 
 #undef ASM_PREFERRED_EH_DATA_FORMAT
 /* This is the same as the default in practice, except that by making
diff --git a/gcc/config/m32c/rtems.h b/gcc/config/m32c/rtems.h
deleted file mode 100644
index 553f77c..0000000
--- a/gcc/config/m32c/rtems.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Definitions for rtems targeting a M32C using ELF.
-   Copyright (C) 2008-2022 Free Software Foundation, Inc.
-   Contributed by Joel Sherrill (joel@OARcorp.com).
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3, or (at your
-   option) any later version.
-
-   GCC is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
-
-   Under Section 7 of GPL version 3, you are granted additional
-   permissions described in the GCC Runtime Library Exception, version
-   3.1, as published by the Free Software Foundation.
-
-   You should have received a copy of the GNU General Public License and
-   a copy of the GCC Runtime Library Exception along with this program;
-   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Target OS builtins.  */
-#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS()		\
-  do						\
-    {						\
-	builtin_define ("__rtems__");		\
-	builtin_define ("__USE_INIT_FINI__");	\
-	builtin_assert ("system=rtems");	\
-    }						\
-  while (0)
-
-/* Use the default */
-#undef LINK_GCC_C_SEQUENCE_SPEC