From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 8B9FC383F092; Tue, 13 Dec 2022 14:31:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B9FC383F092 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670941866; bh=OIwIw2fKIXiQuanbZxg/JAoE9lcJpd1/slVz4va0fmc=; h=From:To:Subject:Date:From; b=AqCsvBBgdrHYZk5Dh4OQHxCEHqyeNL5yVfFUKj8YBf4o8ibCFjk97mxJTSbGZI0/y T3FLCxmfVsQKLLA7s1hTJe0Tpzh0IDKbuhZaNCa55j9j56jfrxH9NASRH3ZapYrRS9 vVcKPUdKKBPHQYbcXe++F3Wa+oANijFHt4dJp2hQ= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: Makefile: build new-cygwin1.dll in a single step X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: e454ca3ec585793728632070befd28959f1377b6 X-Git-Newrev: 99bb3e937a0fdbc1e3acbdc7cefb31e54a89a6ac Message-Id: <20221213143106.8B9FC383F092@sourceware.org> Date: Tue, 13 Dec 2022 14:31:06 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D99bb3e937a0= fdbc1e3acbdc7cefb31e54a89a6ac commit 99bb3e937a0fdbc1e3acbdc7cefb31e54a89a6ac Author: Corinna Vinschen AuthorDate: Tue Dec 13 13:28:16 2022 +0100 Commit: Corinna Vinschen CommitDate: Tue Dec 13 15:25:06 2022 +0100 Cygwin: Makefile: build new-cygwin1.dll in a single step =20 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. =20 Signed-off-by: Corinna Vinschen 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=3D$(tooldir)/include # Parameters used in building the cygwin.dll. =20 DLL_NAME=3Dcygwin1.dll -PRE_DLL_NAME=3Dcygwin0.dll -DBG_DLL_NAME=3Dcygwin1.dbg NEW_DLL_NAME=3Dnew-cygwin1.dll DEF_FILE=3Dcygwin.def LIB_NAME=3Dlibcygwin.a @@ -582,7 +580,7 @@ $(LDSCRIPT): $(LDSCRIPT).in $(AM_V_GEN)$(CC) -E - -P < $^ -o $@ =20 # 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 =20 -# create cygwin1.dbg file -$(DBG_DLL_NAME): $(PRE_DLL_NAME) - $(AM_V_GEN)$(OBJCOPY) --add-gnu-debuglink=3D/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=3D$(DBG_DLL_NAME) \ - $(PRE_DLL_NAME) $(NEW_DLL_NAME) - # cygwin import library toolopts=3D--cpu=3D@target_cpu@ --ar=3D@AR@ --as=3D@AS@ --nm=3D@NM@ --objc= opy=3D@OBJCOPY@ =20 @@ -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