Skip to content

Instantly share code, notes, and snippets.

@iains
Created January 18, 2022 08:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save iains/9e896bd68f9b5c273a6beec40d9be343 to your computer and use it in GitHub Desktop.
Save iains/9e896bd68f9b5c273a6beec40d9be343 to your computer and use it in GitHub Desktop.
ada cc rename fix for Darwin
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 59db72834dc..9e0c545a7be 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 \
@@ -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/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/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 54cf182a8c3..ca12d428a50 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -920,13 +920,13 @@ cal.o : cal.c
deftarg.o : deftarg.c
errno.o : errno.c
exit.o : adaint.h exit.cc
-expect.o : expect.cc
+expect.o : expect.c
final.o : final.cc
rtfinal.o : rtfinal.cc
rtinit.o : rtinit.cc
-locales.o : locales.cc
+locales.o : locales.c
mkdir.o : mkdir.cc
-socket.o : socket.cc gsocket.h
+socket.o : socket.c gsocket.h
sysdep.o : sysdep.c
raise.o : raise.cc raise.h
sigtramp-armdroid.o : sigtramp-armdroid.cc sigtramp.h
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/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/socket.cc b/gcc/ada/socket.c
similarity index 100%
rename from gcc/ada/socket.cc
rename to gcc/ada/socket.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment