From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id E69303858D1E; Wed, 21 Dec 2022 17:43:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E69303858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671644611; bh=rk0qee2xQqpjcdGbT2lFICK+NvitHzedM93ZyJyB3qM=; h=From:To:Subject:Date:From; b=SsGLKo21uxeqAaE4ohZcoPVpOe1YGgJJVvHigJecobEsT/mK2lYsw8cR+5/+WSm21 SeJSEfYZQHU1Evx24A6YFbR/4XrYak3bUp9eE2NlcSjSNX3sfHn8NYt+d3xVuNB0hW 1ipLzWX+DJbpi0QjJINZuevAXhQnl9JB1wguM17o= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Makefile: Drop all the "test dll" considerations X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 09cb4cd2940ff4c8b863cfa2fd2b043b8da0dca2 X-Git-Newrev: 4e7817498efc8ad74b7266d034abc5c4e45de44e Message-Id: <20221221174331.E69303858D1E@sourceware.org> Date: Wed, 21 Dec 2022 17:43:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D4e7817498ef= c8ad74b7266d034abc5c4e45de44e commit 4e7817498efc8ad74b7266d034abc5c4e45de44e Author: Jon Turney Date: Wed Dec 21 13:29:49 2022 +0000 Cygwin: Makefile: Drop all the "test dll" considerations =20 After 90236c3a2cf6, the testsuite is failing, as the cygwin0.dll referenced by the implib that testsuite programs are linked with doesn't exist anymore. =20 We don't need to make and link the testsuite with a specially named DLL, as the cygwin DLL (since 526b0fbca377) takes into consideration the path it's executing from to define separate "Cygwin installations", which don't interact. =20 Fixes: 90236c3a2cf6 ("Cygwin: Makefile: build new-cygwin1.dll in a sing= le step") Diff: --- winsup/cygwin/Makefile.am | 9 ++------- winsup/testsuite/winsup.api/winsup.exp | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am index 0200f6e2a..2faa867f9 100644 --- a/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am @@ -43,7 +43,6 @@ DLL_NAME=3Dcygwin1.dll NEW_DLL_NAME=3Dnew-cygwin1.dll DEF_FILE=3Dcygwin.def LIB_NAME=3Dlibcygwin.a -TEST_LIB_NAME=3Dlibcygwin0.a =20 # # sources @@ -618,10 +617,6 @@ LIBCOS=3D$(addsuffix .o,$(basename $(LIB_FILES))) $(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME) $(AM_V_GEN)$(srcdir)/scripts/mkimport $(toolopts) $(NEW_FUNCTIONS) $@ cyg= dll.a $(wordlist 2,99,$^) =20 -# cygwin import library used by testsuite -$(TEST_LIB_NAME): $(LIB_NAME) - $(AM_V_GEN)perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1= /cygwin0/g' < $? > $@ - # sublibs # import libraries for some subset of symbols indicated by given objects speclib=3D\ @@ -664,7 +659,7 @@ libssp.a: $(LIB_NAME) $(wildcard $(newlib_build)/libc/s= sp/*.o) # all # =20 -all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS) +all-local: $(LIB_NAME) $(SUBLIBS) =20 # # clean @@ -675,7 +670,7 @@ clean-local: -rm -f $(DEF_FILE) sigfe.s -rm -f cygwin.sc cygdll.a cygwin.map -rm -f $(NEW_DLL_NAME) - -rm -f $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS) + -rm -f $(LIB_NAME) $(SUBLIBS) -rm -f version.cc -rm -f tlsoffsets =20 diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/wins= up.api/winsup.exp index 584aa5755..f755c82d9 100644 --- a/winsup/testsuite/winsup.api/winsup.exp +++ b/winsup/testsuite/winsup.api/winsup.exp @@ -61,7 +61,7 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c = $srcdir/$subdir/*/*.{cc if [ file exists "$srcdir/$subdir/$basename.exp" ] then { source "$srcdir/$subdir/$basename.exp" } else { - ws_spawn "$CC -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs= $runtime_root/binmode.o -lgcc $runtime_root/libcygwin0.a -lkernel32 -luser= 32 -o $base.exe" + ws_spawn "$CC -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs= $runtime_root/binmode.o -lgcc $runtime_root/libcygwin.a -lkernel32 -luser3= 2 -o $base.exe" if { $rv } { fail "$testcase (compile)" } else {