Re: [ANNOUNCEMENT] Mass rename of C++ .c files to .cc suffix is going to happen on Jan 17 evening UTC TZ

["Martin Liška" <mliska@suse.cz>]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

On 1/18/22 09:53, Richard Biener wrote:
> Technically all release managers are also global reviewers, but I
> agree the speciality
> of the Ada setup (esp. the runtime being in gcc/) could have been anticipated.

Yeah, I thought that building Ada FE is enough for testing effort, sorry.

I would like to install the following 2 patches that revert the changes.
After the change we're going to have:

marxin@marxinbox:~/Programming/gcc/gcc/ada> find . -name '*.cc'
./gcc-interface/targtyps.cc
./gcc-interface/decl.cc
./gcc-interface/cuintp.cc
./gcc-interface/trans.cc
./gcc-interface/misc.cc
./gcc-interface/utils2.cc
./gcc-interface/utils.cc

So far I've just make check-ada and there are no failures.

May I install the patch?
Thanks,
Martin

[-- Attachment #2: 0002-Ada-Revert-filename-changes-in-comments.patch --]
[-- Type: text/x-patch, Size: 7946 bytes --]

From ddbf347224c27b7ecf41c546081db13cde136cf3 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Tue, 18 Jan 2022 10:02:47 +0100
Subject: [PATCH 2/2] Ada: Revert filename changes in comments.

gcc/ada/ChangeLog:

	* adaint.c: Revert filename changes in comments.
	* ctrl_c.c (dummy_handler): Likewise.
	* gsocket.h: Likewise.
	* init.c (__gnat_error_handler): Likewise.
	* libgnarl/s-intman.ads: Likewise.
	* libgnarl/s-osinte__android.ads: Likewise.
	* libgnarl/s-osinte__darwin.ads: Likewise.
	* libgnarl/s-osinte__hpux.ads: Likewise.
	* libgnarl/s-osinte__linux.ads: Likewise.
	* libgnarl/s-osinte__qnx.ads: Likewise.
	* libgnarl/s-taskin.ads: Likewise.
	* rtfinal.c: Likewise.
---
 gcc/ada/adaint.c                       | 2 +-
 gcc/ada/ctrl_c.c                       | 2 +-
 gcc/ada/gsocket.h                      | 2 +-
 gcc/ada/init.c                         | 2 +-
 gcc/ada/libgnarl/s-intman.ads          | 2 +-
 gcc/ada/libgnarl/s-osinte__android.ads | 2 +-
 gcc/ada/libgnarl/s-osinte__darwin.ads  | 2 +-
 gcc/ada/libgnarl/s-osinte__hpux.ads    | 2 +-
 gcc/ada/libgnarl/s-osinte__linux.ads   | 2 +-
 gcc/ada/libgnarl/s-osinte__qnx.ads     | 2 +-
 gcc/ada/libgnarl/s-taskin.ads          | 2 +-
 gcc/ada/rtfinal.c                      | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index b7b7d7483dd..591d033fbca 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -172,7 +172,7 @@ extern "C" {
 
 #include "mingw32.h"
 
-/* Current code page and CCS encoding to use, set in initialize.cc.  */
+/* Current code page and CCS encoding to use, set in initialize.c.  */
 UINT __gnat_current_codepage;
 UINT __gnat_current_ccs_encoding;
 
diff --git a/gcc/ada/ctrl_c.c b/gcc/ada/ctrl_c.c
index b32baa01b3b..eeec3e64f70 100644
--- a/gcc/ada/ctrl_c.c
+++ b/gcc/ada/ctrl_c.c
@@ -61,7 +61,7 @@ void __gnat_uninstall_int_handler (void);
 void
 dummy_handler () {}
 
-/* Lives in init.cc.  */
+/* Lives in init.c.  */
 extern void (*__gnat_ctrl_c_handler) (void);
 #endif
 
diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index aaeca95ba87..e7284a1ef4e 100644
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -246,7 +246,7 @@
  *                     mutual exclusion
  *
  * See "Handling of gethostbyname, gethostbyaddr, getservbyname and
- * getservbyport" in socket.cc for details.
+ * getservbyport" in socket.c for details.
  */
 
 #if defined (HAVE_GETxxxBYyyy_R)
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 7ee1977279b..6b6ed5fb058 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -542,7 +542,7 @@ __gnat_error_handler (int sig, siginfo_t *si ATTRIBUTE_UNUSED, void *ucontext)
 	 before the faulting address is accessible.  Unfortunately, Linux
 	 seems to have no way of giving us the faulting address.
 
-	 In old versions of init.cc, we had a test of the page before the
+	 In old versions of init.c, we had a test of the page before the
 	 stack pointer:
 
 	   ((volatile char *)
diff --git a/gcc/ada/libgnarl/s-intman.ads b/gcc/ada/libgnarl/s-intman.ads
index 4d5ab60f68f..aef5a779f75 100644
--- a/gcc/ada/libgnarl/s-intman.ads
+++ b/gcc/ada/libgnarl/s-intman.ads
@@ -105,7 +105,7 @@ private
      (C, Adjust_Context_For_Raise, "__gnat_adjust_context_for_raise");
    --  Target specific hook performing adjustments to the signal's machine
    --  context, to be called before an exception may be raised from a signal
-   --  handler. This service is provided by init.cc, together with the
+   --  handler. This service is provided by init.c, together with the
    --  non-tasking signal handler.
 
 end System.Interrupt_Management;
diff --git a/gcc/ada/libgnarl/s-osinte__android.ads b/gcc/ada/libgnarl/s-osinte__android.ads
index 9ef3e30a2bd..f4434f68b22 100644
--- a/gcc/ada/libgnarl/s-osinte__android.ads
+++ b/gcc/ada/libgnarl/s-osinte__android.ads
@@ -309,7 +309,7 @@ package System.OS_Interface is
    --  The alternate signal stack for stack overflows
 
    Alternate_Stack_Size : constant := 16 * 1024;
-   --  This must be in keeping with init.cc:__gnat_alternate_stack
+   --  This must be in keeping with init.c:__gnat_alternate_stack
 
    Stack_Base_Available : constant Boolean := False;
    --  Indicates whether the stack base is available on this target
diff --git a/gcc/ada/libgnarl/s-osinte__darwin.ads b/gcc/ada/libgnarl/s-osinte__darwin.ads
index 12bb1aad648..1856ce9ee58 100644
--- a/gcc/ada/libgnarl/s-osinte__darwin.ads
+++ b/gcc/ada/libgnarl/s-osinte__darwin.ads
@@ -288,7 +288,7 @@ package System.OS_Interface is
    --  The alternate signal stack for stack overflows
 
    Alternate_Stack_Size : constant := 32 * 1024;
-   --  This must be in keeping with init.cc:__gnat_alternate_stack
+   --  This must be in keeping with init.c:__gnat_alternate_stack
 
    Stack_Base_Available : constant Boolean := False;
    --  Indicates whether the stack base is available on this target. This
diff --git a/gcc/ada/libgnarl/s-osinte__hpux.ads b/gcc/ada/libgnarl/s-osinte__hpux.ads
index a1cf316657d..feaedcc0654 100644
--- a/gcc/ada/libgnarl/s-osinte__hpux.ads
+++ b/gcc/ada/libgnarl/s-osinte__hpux.ads
@@ -293,7 +293,7 @@ package System.OS_Interface is
    --  The alternate signal stack for stack overflows
 
    Alternate_Stack_Size : constant := 128 * 1024;
-   --  This must be in keeping with init.cc:__gnat_alternate_stack
+   --  This must be in keeping with init.c:__gnat_alternate_stack
 
    Stack_Base_Available : constant Boolean := False;
    --  Indicates whether the stack base is available on this target
diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
index 3230f28c38b..7c9e7ca4518 100644
--- a/gcc/ada/libgnarl/s-osinte__linux.ads
+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
@@ -331,7 +331,7 @@ package System.OS_Interface is
    pragma Import (C, sigaltstack, "sigaltstack");
 
    Alternate_Stack_Size : constant := 32 * 1024;
-   --  This must be in keeping with init.cc:__gnat_alternate_stack
+   --  This must be in keeping with init.c:__gnat_alternate_stack
 
    Alternate_Stack : aliased char_array (1 .. Alternate_Stack_Size);
    pragma Import (C, Alternate_Stack, "__gnat_alternate_stack");
diff --git a/gcc/ada/libgnarl/s-osinte__qnx.ads b/gcc/ada/libgnarl/s-osinte__qnx.ads
index af877006d99..c7a887abee2 100644
--- a/gcc/ada/libgnarl/s-osinte__qnx.ads
+++ b/gcc/ada/libgnarl/s-osinte__qnx.ads
@@ -310,7 +310,7 @@ package System.OS_Interface is
    --  sigaltstack in QNX
 
    Alternate_Stack_Size : constant := 0;
-   --  This must be kept in sync with init.cc:__gnat_alternate_stack
+   --  This must be kept in sync with init.c:__gnat_alternate_stack
 
    Stack_Base_Available : constant Boolean := False;
    --  Indicates whether the stack base is available on this target
diff --git a/gcc/ada/libgnarl/s-taskin.ads b/gcc/ada/libgnarl/s-taskin.ads
index c4f42fe1f7e..2e6a0bb3bcf 100644
--- a/gcc/ada/libgnarl/s-taskin.ads
+++ b/gcc/ada/libgnarl/s-taskin.ads
@@ -776,7 +776,7 @@ package System.Tasking is
    Unspecified_Priority : constant Integer := -1;
    --  Indicates that a task has an unspecified priority. This is hardcoded as
    --  -1 rather than System.Priority'First - 1 as the value needs to be used
-   --  in init.cc to specify that the main task has no specified priority.
+   --  in init.c to specify that the main task has no specified priority.
 
    Priority_Not_Boosted : constant Integer := System.Priority'First - 1;
    --  Definition of Priority actually has to come from the RTS configuration
diff --git a/gcc/ada/rtfinal.c b/gcc/ada/rtfinal.c
index ba7c61e7b07..543e3a29f07 100644
--- a/gcc/ada/rtfinal.c
+++ b/gcc/ada/rtfinal.c
@@ -43,7 +43,7 @@ extern void __gnat_runtime_finalize (void);
    Note that __gnat_runtime_finalize() is called in adafinal()   */
 
 extern int __gnat_rt_init_count;
-/*  see initialize.cc  */
+/*  see initialize.c  */
 
 #if defined (__MINGW32__)
 #include "mingw32.h"
-- 
2.34.1


[-- Attachment #3: 0001-Revert-Ada-.cc-renaming-renaming.patch --]
[-- Type: text/x-patch, Size: 17758 bytes --]

From 59ec94ab9246b439ece3cbc3b6504681a702e990 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Tue, 18 Jan 2022 09:54:35 +0100
Subject: [PATCH 1/2] Revert Ada .cc renaming renaming.

gcc/ada/ChangeLog:

	* Make-generated.in: Revert renaming changes.
	* Makefile.rtl: Likewise.
	* adadecode.cc: Moved to...
	* adadecode.c: ...here.
	* affinity.cc: Moved to...
	* affinity.c: ...here.
	* argv-lynxos178-raven-cert.cc: Moved to...
	* argv-lynxos178-raven-cert.c: ...here.
	* argv.cc: Moved to...
	* argv.c: ...here.
	* aux-io.cc: Moved to...
	* aux-io.c: ...here.
	* cio.cc: Moved to...
	* cio.c: ...here.
	* cstreams.cc: Moved to...
	* cstreams.c: ...here.
	* env.cc: Moved to...
	* env.c: ...here.
	* exit.cc: Moved to...
	* exit.c: ...here.
	* expect.cc: Moved to...
	* expect.c: ...here.
	* final.cc: Moved to...
	* final.c: ...here.
	* gcc-interface/Makefile.in:
	* init.cc: Moved to...
	* init.c: ...here.
	* initialize.cc: Moved to...
	* initialize.c: ...here.
	* libgnarl/thread.cc: Moved to...
	* libgnarl/thread.c: ...here.
	* link.cc: Moved to...
	* link.c: ...here.
	* locales.cc: Moved to...
	* locales.c: ...here.
	* mkdir.cc: Moved to...
	* mkdir.c: ...here.
	* raise.cc: Moved to...
	* raise.c: ...here.
	* rtfinal.cc: Moved to...
	* rtfinal.c: ...here.
	* rtinit.cc: Moved to...
	* rtinit.c: ...here.
	* s-oscons-tmplt.c (CND):
	* seh_init.cc: Moved to...
	* seh_init.c: ...here.
	* sigtramp-armdroid.cc: Moved to...
	* sigtramp-armdroid.c: ...here.
	* sigtramp-ios.cc: Moved to...
	* sigtramp-ios.c: ...here.
	* sigtramp-qnx.cc: Moved to...
	* sigtramp-qnx.c: ...here.
	* sigtramp-vxworks.cc: Moved to...
	* sigtramp-vxworks.c: ...here.
	* socket.cc: Moved to...
	* socket.c: ...here.
	* tracebak.cc: Moved to...
	* tracebak.c: ...here.
	* version.cc: Moved to...
	* version.c: ...here.
	* vx_stack_info.cc: Moved to...
	* vx_stack_info.c: ...here.
---
 gcc/ada/Make-generated.in                     |  2 +-
 gcc/ada/Makefile.rtl                          |  8 +--
 gcc/ada/{adadecode.cc => adadecode.c}         |  0
 gcc/ada/{affinity.cc => affinity.c}           |  0
 ...en-cert.cc => argv-lynxos178-raven-cert.c} |  0
 gcc/ada/{argv.cc => argv.c}                   |  0
 gcc/ada/{aux-io.cc => aux-io.c}               |  0
 gcc/ada/{cio.cc => cio.c}                     |  0
 gcc/ada/{cstreams.cc => cstreams.c}           |  0
 gcc/ada/{env.cc => env.c}                     |  0
 gcc/ada/{exit.cc => exit.c}                   |  0
 gcc/ada/{expect.cc => expect.c}               |  0
 gcc/ada/{final.cc => final.c}                 |  0
 gcc/ada/gcc-interface/Makefile.in             | 58 +++++++++----------
 gcc/ada/{init.cc => init.c}                   |  0
 gcc/ada/{initialize.cc => initialize.c}       |  0
 gcc/ada/libgnarl/{thread.cc => thread.c}      |  0
 gcc/ada/{link.cc => link.c}                   |  0
 gcc/ada/{locales.cc => locales.c}             |  0
 gcc/ada/{mkdir.cc => mkdir.c}                 |  0
 gcc/ada/{raise.cc => raise.c}                 |  0
 gcc/ada/{rtfinal.cc => rtfinal.c}             |  0
 gcc/ada/{rtinit.cc => rtinit.c}               |  0
 gcc/ada/s-oscons-tmplt.c                      |  2 +-
 gcc/ada/{seh_init.cc => seh_init.c}           |  0
 ...gtramp-armdroid.cc => sigtramp-armdroid.c} |  0
 gcc/ada/{sigtramp-ios.cc => sigtramp-ios.c}   |  0
 gcc/ada/{sigtramp-qnx.cc => sigtramp-qnx.c}   |  0
 ...sigtramp-vxworks.cc => sigtramp-vxworks.c} |  0
 gcc/ada/{socket.cc => socket.c}               |  0
 gcc/ada/{tracebak.cc => tracebak.c}           |  0
 gcc/ada/{version.cc => version.c}             |  0
 gcc/ada/{vx_stack_info.cc => vx_stack_info.c} |  0
 33 files changed, 32 insertions(+), 38 deletions(-)
 rename gcc/ada/{adadecode.cc => adadecode.c} (100%)
 rename gcc/ada/{affinity.cc => affinity.c} (100%)
 rename gcc/ada/{argv-lynxos178-raven-cert.cc => argv-lynxos178-raven-cert.c} (100%)
 rename gcc/ada/{argv.cc => argv.c} (100%)
 rename gcc/ada/{aux-io.cc => aux-io.c} (100%)
 rename gcc/ada/{cio.cc => cio.c} (100%)
 rename gcc/ada/{cstreams.cc => cstreams.c} (100%)
 rename gcc/ada/{env.cc => env.c} (100%)
 rename gcc/ada/{exit.cc => exit.c} (100%)
 rename gcc/ada/{expect.cc => expect.c} (100%)
 rename gcc/ada/{final.cc => final.c} (100%)
 rename gcc/ada/{init.cc => init.c} (100%)
 rename gcc/ada/{initialize.cc => initialize.c} (100%)
 rename gcc/ada/libgnarl/{thread.cc => thread.c} (100%)
 rename gcc/ada/{link.cc => link.c} (100%)
 rename gcc/ada/{locales.cc => locales.c} (100%)
 rename gcc/ada/{mkdir.cc => mkdir.c} (100%)
 rename gcc/ada/{raise.cc => raise.c} (100%)
 rename gcc/ada/{rtfinal.cc => rtfinal.c} (100%)
 rename gcc/ada/{rtinit.cc => rtinit.c} (100%)
 rename gcc/ada/{seh_init.cc => seh_init.c} (100%)
 rename gcc/ada/{sigtramp-armdroid.cc => sigtramp-armdroid.c} (100%)
 rename gcc/ada/{sigtramp-ios.cc => sigtramp-ios.c} (100%)
 rename gcc/ada/{sigtramp-qnx.cc => sigtramp-qnx.c} (100%)
 rename gcc/ada/{sigtramp-vxworks.cc => sigtramp-vxworks.c} (100%)
 rename gcc/ada/{socket.cc => socket.c} (100%)
 rename gcc/ada/{tracebak.cc => tracebak.c} (100%)
 rename gcc/ada/{version.cc => version.c} (100%)
 rename gcc/ada/{vx_stack_info.cc => vx_stack_info.c} (100%)

diff --git a/gcc/ada/Make-generated.in b/gcc/ada/Make-generated.in
index 6cdc6b4605e..948fc508a56 100644
--- a/gcc/ada/Make-generated.in
+++ b/gcc/ada/Make-generated.in
@@ -53,7 +53,7 @@ ada/stamp-snames : ada/snames.ads-tmpl ada/snames.adb-tmpl ada/snames.h-tmpl ada
 	touch ada/stamp-snames
 
 ada/sdefault.adb: ada/stamp-sdefault ; @true
-ada/stamp-sdefault : $(srcdir)/ada/version.cc Makefile
+ada/stamp-sdefault : $(srcdir)/ada/version.c Makefile
 	$(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb
 	$(ECHO) "with Osint; use Osint;" >>tmp-sdefault.adb
 	$(ECHO) "package body Sdefault is" >>tmp-sdefault.adb
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 59db72834dc..1b066ad6b14 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -2856,7 +2856,7 @@ LIBGNAT_TARGET_PAIRS += \
 
 # LIBGNAT_SRCS is the list of all C files (including headers) of the runtime
 # library.  LIBGNAT_OBJS is the list of object files for libgnat.
-# thread.cc is special as put into GNATRTL_TASKING_OBJS
+# thread.c is special as put into GNATRTL_TASKING_OBJS
 LIBGNAT_OBJS = adadecode.o adaint.o argv.o aux-io.o 			\
   cal.o cio.o cstreams.o ctrl_c.o					\
   env.o errno.o exit.o expect.o final.o rtfinal.o rtinit.o		\
@@ -2870,7 +2870,7 @@ LIBGNAT_OBJS = adadecode.o adaint.o argv.o aux-io.o 			\
 #  GNAT_RTL_SRCS.  Right now we count on being able to build GNATRTL_OBJS
 #  from ADA_INCLUDE_SRCS.
 
-LIBGNAT_SRCS = $(patsubst %.o,%.cc,$(LIBGNAT_OBJS))			\
+LIBGNAT_SRCS = $(patsubst %.o,%.c,$(LIBGNAT_OBJS))			\
   adadecode.h adaint.h env.h gsocket.h raise.h standard.ads.h		\
   runtime.h $(EXTRA_LIBGNAT_SRCS)
 
@@ -2920,7 +2920,7 @@ setup-rts: force
 	$(MKDIR) $(RTSDIR)
 	$(CHMOD) u+w $(RTSDIR)
 # Copy target independent sources
-	$(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS) libgnarl/thread.cc, \
+	$(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS) libgnarl/thread.c, \
 	  $(LN_S) $(GNAT_SRC)/$(f) $(RTSDIR) ;) true
 # Remove files not used
 	$(RM) $(patsubst %,$(RTSDIR)/%,$(ADA_EXCLUDE_FILES))
@@ -2941,7 +2941,7 @@ setup-rts: force
 	do \
 	  if [ -f $(RTSDIR)/$$f ]; then echo $$f >> $(RTSDIR)/libgnarl.lst; fi \
 	done
-	@echo thread.cc >> $(RTSDIR)/libgnarl.lst
+	@echo thread.c >> $(RTSDIR)/libgnarl.lst
 	@for f in \
 	  $(foreach F,$(GNATRTL_NONTASKING_OBJS),$(subst $(objext),.ads,$(F))) \
 	  $(foreach F,$(GNATRTL_NONTASKING_OBJS),$(subst $(objext),.adb,$(F))); \
diff --git a/gcc/ada/adadecode.cc b/gcc/ada/adadecode.c
similarity index 100%
rename from gcc/ada/adadecode.cc
rename to gcc/ada/adadecode.c
diff --git a/gcc/ada/affinity.cc b/gcc/ada/affinity.c
similarity index 100%
rename from gcc/ada/affinity.cc
rename to gcc/ada/affinity.c
diff --git a/gcc/ada/argv-lynxos178-raven-cert.cc b/gcc/ada/argv-lynxos178-raven-cert.c
similarity index 100%
rename from gcc/ada/argv-lynxos178-raven-cert.cc
rename to gcc/ada/argv-lynxos178-raven-cert.c
diff --git a/gcc/ada/argv.cc b/gcc/ada/argv.c
similarity index 100%
rename from gcc/ada/argv.cc
rename to gcc/ada/argv.c
diff --git a/gcc/ada/aux-io.cc b/gcc/ada/aux-io.c
similarity index 100%
rename from gcc/ada/aux-io.cc
rename to gcc/ada/aux-io.c
diff --git a/gcc/ada/cio.cc b/gcc/ada/cio.c
similarity index 100%
rename from gcc/ada/cio.cc
rename to gcc/ada/cio.c
diff --git a/gcc/ada/cstreams.cc b/gcc/ada/cstreams.c
similarity index 100%
rename from gcc/ada/cstreams.cc
rename to gcc/ada/cstreams.c
diff --git a/gcc/ada/env.cc b/gcc/ada/env.c
similarity index 100%
rename from gcc/ada/env.cc
rename to gcc/ada/env.c
diff --git a/gcc/ada/exit.cc b/gcc/ada/exit.c
similarity index 100%
rename from gcc/ada/exit.cc
rename to gcc/ada/exit.c
diff --git a/gcc/ada/expect.cc b/gcc/ada/expect.c
similarity index 100%
rename from gcc/ada/expect.cc
rename to gcc/ada/expect.c
diff --git a/gcc/ada/final.cc b/gcc/ada/final.c
similarity index 100%
rename from gcc/ada/final.cc
rename to gcc/ada/final.c
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 54cf182a8c3..53d0739470a 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -147,8 +147,8 @@ host_os=@host_os@
 target_cpu_default = @target_cpu_default@
 xmake_file = @xmake_file@
 tmake_file = @tmake_file@
-#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.cc`
-#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.cc`
+#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
+#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
 
 # Directory where sources are, from where we are.
 VPATH = $(srcdir)/ada
@@ -222,7 +222,7 @@ endif
 all.indirect: Makefile ../gnat1$(exeext)
 
 # IN_GCC is meant to distinguish between code compiled into GCC itself, i.e.
-# for the host, and the rest.  But we also use it for the tools (link.cc) and
+# for the host, and the rest.  But we also use it for the tools (link.c) and
 # even break the host/target wall by using it for the library (targext.c).
 # autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a cross
 # compiler which does not use the native libraries and headers.
@@ -240,7 +240,7 @@ ALL_COMPILERFLAGS = $(ALL_CFLAGS)
 # This is where we get libiberty.a from.
 LIBIBERTY = ../../libiberty/libiberty.a
 
-# We need to link against libbacktrace because diagnostic.cc in
+# We need to link against libbacktrace because diagnostic.c in
 # libcommon.a uses it.
 LIBBACKTRACE = ../../libbacktrace/.libs/libbacktrace.a
 
@@ -296,10 +296,6 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
 	  $(INCLUDES) $< $(OUTPUT_OPTION)
 
-.cc.o:
-	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
-	  $(INCLUDES) $< $(OUTPUT_OPTION)
-
 .adb.o:
 	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
@@ -307,7 +303,7 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
 	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
 # how to regenerate this file
-Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/ada/version.cc
+Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/ada/version.c
 	cd ..; \
 	LANGUAGES="$(CONFIG_LANGUAGES)" \
 	CONFIG_HEADERS= \
@@ -415,7 +411,6 @@ ifeq ($(TOOLSCASE),native)
   vpath %.ads ../$(RTSDIR) ../
   vpath %.adb ../$(RTSDIR) ../
   vpath %.c   ../$(RTSDIR) ../
-  vpath %.cc  ../$(RTSDIR) ../
   vpath %.h   ../$(RTSDIR) ../
 endif
 
@@ -425,7 +420,6 @@ ifeq ($(TOOLSCASE),cross)
   vpath %.ads ../
   vpath %.adb ../
   vpath %.c   ../
-  vpath %.cc  ../
   vpath %.h   ../
 endif
 
@@ -909,44 +903,44 @@ ADA_RTL_DSO_DIR = $(toolexeclibdir)
 # need to keep the frame pointer in tracebak.o to pop the stack properly on
 # some targets.
 
-tracebak.o  : tracebak.cc
+tracebak.o  : tracebak.c
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
 	      $(INCLUDES) $(NO_OMIT_ADAFLAGS) $< $(OUTPUT_OPTION)
 
-adadecode.o : adadecode.cc adadecode.h
-aux-io.o  : aux-io.cc
-argv.o    : argv.cc
+adadecode.o : adadecode.c adadecode.h
+aux-io.o  : aux-io.c
+argv.o    : argv.c
 cal.o     : cal.c
 deftarg.o : deftarg.c
 errno.o   : errno.c
-exit.o    : adaint.h exit.cc
-expect.o  : expect.cc
-final.o   : final.cc
-rtfinal.o : rtfinal.cc
-rtinit.o  : rtinit.cc
-locales.o : locales.cc
-mkdir.o   : mkdir.cc
-socket.o  : socket.cc gsocket.h
+exit.o    : adaint.h exit.c
+expect.o  : expect.c
+final.o   : final.c
+rtfinal.o : rtfinal.c
+rtinit.o  : rtinit.c
+locales.o : locales.c
+mkdir.o   : mkdir.c
+socket.o  : socket.c gsocket.h
 sysdep.o  : sysdep.c
-raise.o   : raise.cc raise.h
-sigtramp-armdroid.o      : sigtramp-armdroid.cc sigtramp.h
+raise.o   : raise.c raise.h
+sigtramp-armdroid.o      : sigtramp-armdroid.c sigtramp.h
 sigtramp-armvxworks.o    : sigtramp-armvxworks.c sigtramp.h
-sigtramp-ios.o           : sigtramp-ios.cc sigtramp.h
-sigtramp-vxworks.o       : sigtramp-vxworks.cc $(VX_SIGTRAMP_EXTRA_SRCS)
+sigtramp-ios.o           : sigtramp-ios.c sigtramp.h
+sigtramp-vxworks.o       : sigtramp-vxworks.c $(VX_SIGTRAMP_EXTRA_SRCS)
 sigtramp-vxworks-vxsim.o : sigtramp-vxworks-vxsim.c $(VX_SIGTRAMP_EXTRA_SRCS)
 terminals.o : terminals.c
-vx_stack_info.o : vx_stack_info.cc
+vx_stack_info.o : vx_stack_info.c
 
 raise-gcc.o : raise-gcc.c raise.h
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 		-iquote $(srcdir) -iquote $(ftop_srcdir)/libgcc \
 		$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-cio.o     : cio.cc
+cio.o     : cio.c
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-init.o    : init.cc adaint.h raise.h
+init.o    : init.c adaint.h raise.h
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
@@ -954,11 +948,11 @@ init-vxsim.o : init-vxsim.c
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-initialize.o : initialize.cc raise.h
+initialize.o : initialize.c raise.h
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-link.o : link.cc
+link.o : link.c
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
 		$(ALL_CPPFLAGS) $(INCLUDES_FOR_SUBDIR) \
 		$< $(OUTPUT_OPTION)
diff --git a/gcc/ada/init.cc b/gcc/ada/init.c
similarity index 100%
rename from gcc/ada/init.cc
rename to gcc/ada/init.c
diff --git a/gcc/ada/initialize.cc b/gcc/ada/initialize.c
similarity index 100%
rename from gcc/ada/initialize.cc
rename to gcc/ada/initialize.c
diff --git a/gcc/ada/libgnarl/thread.cc b/gcc/ada/libgnarl/thread.c
similarity index 100%
rename from gcc/ada/libgnarl/thread.cc
rename to gcc/ada/libgnarl/thread.c
diff --git a/gcc/ada/link.cc b/gcc/ada/link.c
similarity index 100%
rename from gcc/ada/link.cc
rename to gcc/ada/link.c
diff --git a/gcc/ada/locales.cc b/gcc/ada/locales.c
similarity index 100%
rename from gcc/ada/locales.cc
rename to gcc/ada/locales.c
diff --git a/gcc/ada/mkdir.cc b/gcc/ada/mkdir.c
similarity index 100%
rename from gcc/ada/mkdir.cc
rename to gcc/ada/mkdir.c
diff --git a/gcc/ada/raise.cc b/gcc/ada/raise.c
similarity index 100%
rename from gcc/ada/raise.cc
rename to gcc/ada/raise.c
diff --git a/gcc/ada/rtfinal.cc b/gcc/ada/rtfinal.c
similarity index 100%
rename from gcc/ada/rtfinal.cc
rename to gcc/ada/rtfinal.c
diff --git a/gcc/ada/rtinit.cc b/gcc/ada/rtinit.c
similarity index 100%
rename from gcc/ada/rtinit.cc
rename to gcc/ada/rtinit.c
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index ea7d256ed43..af6919092d5 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -1976,7 +1976,7 @@ CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock")
  || defined(__DragonFly__) || defined(__QNX__)
 /** On these platforms use system provided monotonic clock instead of
  ** the default CLOCK_REALTIME. We then need to set up cond var attributes
- ** appropriately (see thread.cc).
+ ** appropriately (see thread.c).
  **
  ** Note that AIX 5.2 does not support CLOCK_MONOTONIC timestamps for
  ** pthread_cond_timedwait (and does not have pthread_condattr_setclock),
diff --git a/gcc/ada/seh_init.cc b/gcc/ada/seh_init.c
similarity index 100%
rename from gcc/ada/seh_init.cc
rename to gcc/ada/seh_init.c
diff --git a/gcc/ada/sigtramp-armdroid.cc b/gcc/ada/sigtramp-armdroid.c
similarity index 100%
rename from gcc/ada/sigtramp-armdroid.cc
rename to gcc/ada/sigtramp-armdroid.c
diff --git a/gcc/ada/sigtramp-ios.cc b/gcc/ada/sigtramp-ios.c
similarity index 100%
rename from gcc/ada/sigtramp-ios.cc
rename to gcc/ada/sigtramp-ios.c
diff --git a/gcc/ada/sigtramp-qnx.cc b/gcc/ada/sigtramp-qnx.c
similarity index 100%
rename from gcc/ada/sigtramp-qnx.cc
rename to gcc/ada/sigtramp-qnx.c
diff --git a/gcc/ada/sigtramp-vxworks.cc b/gcc/ada/sigtramp-vxworks.c
similarity index 100%
rename from gcc/ada/sigtramp-vxworks.cc
rename to gcc/ada/sigtramp-vxworks.c
diff --git a/gcc/ada/socket.cc b/gcc/ada/socket.c
similarity index 100%
rename from gcc/ada/socket.cc
rename to gcc/ada/socket.c
diff --git a/gcc/ada/tracebak.cc b/gcc/ada/tracebak.c
similarity index 100%
rename from gcc/ada/tracebak.cc
rename to gcc/ada/tracebak.c
diff --git a/gcc/ada/version.cc b/gcc/ada/version.c
similarity index 100%
rename from gcc/ada/version.cc
rename to gcc/ada/version.c
diff --git a/gcc/ada/vx_stack_info.cc b/gcc/ada/vx_stack_info.c
similarity index 100%
rename from gcc/ada/vx_stack_info.cc
rename to gcc/ada/vx_stack_info.c
-- 
2.34.1