[newlib-cygwin] Revert "Cygwin: gendef generates sigfe.s and cygwin.def"
Jon TURNEY
jturney@sourceware.org
Fri Oct 30 16:31:39 GMT 2020
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9517e5f5031c2c11eb0e6fe33068b0025a6b0f49
commit 9517e5f5031c2c11eb0e6fe33068b0025a6b0f49
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Oct 28 15:31:27 2020 +0000
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:
---
winsup/cygwin/Makefile.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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 $@ $<
More information about the Cygwin-cvs
mailing list