public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: Makefile: build new-cygwin1.dll in a single step
Date: Tue, 13 Dec 2022 14:31:06 +0000 (GMT) [thread overview]
Message-ID: <20221213143106.8B9FC383F092@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=99bb3e937a0fdbc1e3acbdc7cefb31e54a89a6ac
commit 99bb3e937a0fdbc1e3acbdc7cefb31e54a89a6ac
Author: Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Tue Dec 13 13:28:16 2022 +0100
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Tue Dec 13 15:25:06 2022 +0100
Cygwin: Makefile: build new-cygwin1.dll in a single step
The complicated build routine was only required because we needed
the .cygheap section at the end of the file, and the debug sections
broke this. Now that the cygheap is out of the way, we really don't
have to do this anymore, and the build can just generate a DLL with
integrated debug info.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/Makefile.am | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index cf12b97f838a..167be8149a3c 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -40,8 +40,6 @@ toolincludedir=$(tooldir)/include
# Parameters used in building the cygwin.dll.
DLL_NAME=cygwin1.dll
-PRE_DLL_NAME=cygwin0.dll
-DBG_DLL_NAME=cygwin1.dbg
NEW_DLL_NAME=new-cygwin1.dll
DEF_FILE=cygwin.def
LIB_NAME=libcygwin.a
@@ -582,7 +580,7 @@ $(LDSCRIPT): $(LDSCRIPT).in
$(AM_V_GEN)$(CC) -E - -P < $^ -o $@
# cygwin dll
-$(PRE_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
+$(NEW_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
$(newlib_build)/libm.a $(newlib_build)/libc.a
$(AM_V_CXXLD)$(CXX) $(CXXFLAGS) \
-mno-use-libstdc-wrappers \
@@ -597,19 +595,6 @@ $(PRE_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
$(newlib_build)/libc.a \
-lgcc -lkernel32 -lntdll -Wl,-Map,cygwin.map
-# create cygwin1.dbg file
-$(DBG_DLL_NAME): $(PRE_DLL_NAME)
- $(AM_V_GEN)$(OBJCOPY) --add-gnu-debuglink=/dev/null \
- --only-keep-debug \
- $(PRE_DLL_NAME) \
- $(DBG_DLL_NAME)
-
-# create stripped release DLL, append .gnu_debuglink section
-$(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
- $(AM_V_GEN)$(OBJCOPY) -g \
- --add-gnu-debuglink=$(DBG_DLL_NAME) \
- $(PRE_DLL_NAME) $(NEW_DLL_NAME)
-
# cygwin import library
toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
@@ -681,7 +666,7 @@ clean-local:
-rm -f $(BUILT_SOURCES)
-rm -f $(DEF_FILE) sigfe.s
-rm -f cygwin.sc cygdll.a cygwin.map
- -rm -f $(PRE_DLL_NAME) $(DBG_DLL_NAME) $(NEW_DLL_NAME)
+ -rm -f $(NEW_DLL_NAME)
-rm -f $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
-rm -f version.cc
-rm -f tlsoffsets
reply other threads:[~2022-12-13 14:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221213143106.8B9FC383F092@sourceware.org \
--to=corinna@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).