* Makefile.in: Accomodate newer gcc's which require linking of c++ programs

with g++.  Fixup output for some compilations.
* cygcheck.cc: Respond to compiler warnings.
* dumper.cc (main): Ditto.
* parse_pe.cc (exclusion::sort_and_check): Ditto.
* setfacl.cc (getaclentry): Ditto.

1 files changed, 37 insertions, 16 deletions

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 8526069bd..2d0bfd018 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -27,6 +27,8 @@ EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@
 
 CC:=@CC@
 CC_FOR_TARGET:=$(CC)
+CXX:=${subst gcc,g++,$(CC)}
+CXX_FOR_TARGET:=$(CXX)
 
 CFLAGS:=@CFLAGS@
 CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -nostdinc++ -fno-rtti
@@ -42,9 +44,7 @@ build_dumper:=${shell test -r $(libbfd) -a -r $(libintl) -a -d $(updir1)/include
 DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include
 
 MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES)
-MINGW_CFLAGS:=$(CFLAGS) -mno-cygwin $(MINGW_INCLUDES)
-
-DUMPER_CFLAGS:=$(CFLAGS) $(INCLUDES) $(DUMPER_INCLUDES)
+MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
 
 libcygwin:=$(cygwin_build)/libcygwin.a
 libuser32:=$(w32api_lib)/libuser32.a
@@ -89,23 +89,44 @@ all: Makefile $(PROGS)
 
 strace.exe: strace.cc mingw_getopt.o $(MINGW_DEP_LDLIBS)
 ifdef VERBOSE
-	$(CC) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
+	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
 else
-	@echo $(CC) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
-	$(CC) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
+	@echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
+	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
 endif
 
 dumper.o: dumper.cc dumper.h
-	$(CC) -c -o $@ $(DUMPER_CFLAGS) ${firstword $^}
+ifdef VERBOSE
+	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+else
+	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+endif
+
 
 module_info.o: module_info.cc
-	$(CC) -c -o $@ $(DUMPER_CFLAGS) $^
+ifdef VERBOSE
+	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+else
+	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+endif
 
 parse_pe.o: parse_pe.cc dumper.h
-	$(CC) -c -o $@ $(DUMPER_CFLAGS) ${firstword $^}
+ifdef VERBOSE
+	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+else
+	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+endif
 
 mingw_getopt.o: $(cygwin_source)/lib/getopt.c
-	$(CC) -c -o $@ $(MINGW_CFLAGS) $^
+ifdef VERBOSE
+	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
+else
+	@echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\
+	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
+endif
 
 clean:
 	rm -f *.o $(CLEAN_PROGS)
@@ -135,16 +156,16 @@ warn_dumper:
 
 dumper.exe: module_info.o parse_pe.o dumper.o $(ALL_DEP_LDLIBS)
 ifdef VERBOSE
-	$(CC) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
+	$(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
 else
-	@echo $(CC) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(DUMPER_LDFLAGS)};\
-	$(CC) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
+	@echo $(CXX) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(DUMPER_LDFLAGS)};\
+	$(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
 endif
 
 %.exe: %.o $(ALL_DEP_LDLIBS)
 ifdef VERBOSE
-	$(CC) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
+	$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
 else
-	@echo $(CC) -o $@ ${firstword $^} ${filter-out -B%, $(ALL_LDFLAGS)};\
-	$(CC) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
+	@echo $(CXX) -o $@ ${firstword $^} ${filter-out -B%, $(ALL_LDFLAGS)};\
+	$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
 endif