From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 28 Oct 2020 15:31:27 +0000 (+0000)
Subject: Revert "Cygwin: gendef generates sigfe.s and cygwin.def"
X-Git-Tag: newlib-4.0.0~28
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=9517e5f5031c2c11eb0e6fe33068b0025a6b0f49;p=newlib-cygwin.git

Revert "Cygwin: gendef generates sigfe.s and cygwin.def"

This reverts commit 74a164f1c162645f4389bbd9edb2f89a630853af.

Shame we can't use '&:' for a grouped target here, since that requires
GNU make 4.3
---

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index f6236d909..cb9924b3a 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -783,13 +783,16 @@ $(VERSION_OFILES): version.cc
 Makefile: ${srcdir}/Makefile.in
 	/bin/sh ./config.status
 
-$(DEF_FILE) sigfe.s: gendef $(srcdir)/$(TLSOFFSETS_H) $(DIN_FILE)
-	$(word 1,$^) --cpu=${target_cpu} --output-def=$(DEF_FILE) --tlsoffsets=$(word 2,$^) $(wordlist 3,4,$^)
+$(DEF_FILE): gendef $(srcdir)/$(TLSOFFSETS_H) $(DIN_FILE)
+	$(word 1,$^) --cpu=${target_cpu} --output-def=$@  --tlsoffsets=$(word 2,$^) $(wordlist 3,99,$^)
 
 $(srcdir)/$(TLSOFFSETS_H): gentls_offsets cygtls.h
 	$^ $@ $(target_cpu) $(COMPILE.cc) -c || rm $@
 
 sigfe.s: $(DEF_FILE)
+	@[ -s $@ ] || \
+	{ rm -f $(DEF_FILE); $(MAKE) -s -j1 $(DEF_FILE); }; \
+	[ -s $@ ] && touch $@
 
 sigfe.o: sigfe.s $(srcdir)/$(TLSOFFSETS_H)
 	$(CC) ${CFLAGS} -c -o $@ $<