From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 13515385737C; Mon, 8 Aug 2022 16:17:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13515385737C 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: fold common.din and x86_64.din into cygwin.din X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 5858c2301521b2422dad46a93f45500b63f4a760 X-Git-Newrev: 3ba050dfcd1d7e1462edf8b7c3d557f09ed993a6 Message-Id: <20220808161711.13515385737C@sourceware.org> Date: Mon, 8 Aug 2022 16:17:11 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2022 16:17:11 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3ba050dfcd1= d7e1462edf8b7c3d557f09ed993a6 commit 3ba050dfcd1d7e1462edf8b7c3d557f09ed993a6 Author: Corinna Vinschen Date: Mon Aug 8 17:47:46 2022 +0200 Cygwin: fold common.din and x86_64.din into cygwin.din =20 We don't need a target-specific DEF file anymore =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/configure.ac | 2 -- winsup/cygwin/Makefile.am | 5 ++--- winsup/cygwin/{common.din =3D> cygwin.din} | 10 ++++++++++ winsup/cygwin/x86_64.din | 11 ----------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/winsup/configure.ac b/winsup/configure.ac index 634493e59..9205a8886 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -66,7 +66,6 @@ esac ]) =20 DLL_ENTRY=3D"dll_entry" -DIN_FILE=3D"${target_cpu}.din" =20 case "$target_cpu" in x86_64) ;; @@ -74,7 +73,6 @@ case "$target_cpu" in esac =20 AC_SUBST(DLL_ENTRY) -AC_SUBST(DIN_FILE) =20 AM_CONDITIONAL(TARGET_X86_64, [test $target_cpu =3D "x86_64"]) =20 diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am index b8436226b..6debcc4f2 100644 --- a/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am @@ -43,7 +43,6 @@ DLL_NAME=3Dcygwin1.dll PRE_DLL_NAME=3Dcygwin0.dll DBG_DLL_NAME=3Dcygwin1.dbg NEW_DLL_NAME=3Dnew-cygwin1.dll -DIN_FILE=3D@DIN_FILE@ DEF_FILE=3Dcygwin.def LIB_NAME=3Dlibcygwin.a TEST_LIB_NAME=3Dlibcygwin0.a @@ -622,8 +621,8 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_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 -$(DEF_FILE): scripts/gendef $(DIN_FILE) common.din - $(AM_V_GEN)$(srcdir)/scripts/gendef --cpu=3D@target_cpu@ --output-def=3D$= (DEF_FILE) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din +$(DEF_FILE): scripts/gendef cygwin.din + $(AM_V_GEN)$(srcdir)/scripts/gendef --cpu=3D@target_cpu@ --output-def=3D$= (DEF_FILE) $(srcdir)/cygwin.din =20 sigfe.s: $(DEF_FILE) tlsoffsets @[ -s $@ ] || \ diff --git a/winsup/cygwin/common.din b/winsup/cygwin/cygwin.din similarity index 98% rename from winsup/cygwin/common.din rename to winsup/cygwin/cygwin.din index afcb71725..c6768e4fc 100644 --- a/winsup/cygwin/common.din +++ b/winsup/cygwin/cygwin.din @@ -1,3 +1,6 @@ +LIBRARY "cygwin1.dll" BASE=3D0x180040000 + +EXPORTS # Exported variables __argc DATA __argv DATA @@ -122,10 +125,16 @@ __wrap__ZdaPv NOSIGFE # void operator d= elete[](void *p) throw() __wrap__ZdaPvRKSt9nothrow_t NOSIGFE # void operator delete[](void *p, cons= t std::nothrow_t &nt) throw() __wrap__ZdlPv NOSIGFE # void operator delete(void *p) throw() __wrap__ZdlPvRKSt9nothrow_t NOSIGFE # void operator delete(void *p, const = std::nothrow_t &nt) throw() +__wrap__Znam NOSIGFE # void *operator new[](std::size_t sz)= throw (std::bad_alloc) +__wrap__ZnamRKSt9nothrow_t NOSIGFE # void *operator new[](std::size_t sz,= const std::nothrow_t &nt) throw() +__wrap__Znwm NOSIGFE # void *operator new(std::size_t sz) t= hrow (std::bad_alloc) +__wrap__ZnwmRKSt9nothrow_t NOSIGFE # void *operator new(std::size_t sz, c= onst std::nothrow_t &nt) throw() __xdrrec_getrec SIGFE __xdrrec_setnonblock SIGFE __xpg_sigpause SIGFE __xpg_strerror_r SIGFE +_alloca =3D __alloca NOSIGFE +_dll_crt0 NOSIGFE _Exit SIGFE _exit SIGFE _feinitialise NOSIGFE @@ -421,6 +430,7 @@ dlerror NOSIGFE dlfork NOSIGFE dll_crt0__FP11per_process NOSIGFE # dll_crt0(per_process *) dll_dllcrt0 NOSIGFE +dll_entry NOSIGFE dlopen SIGFE dlsym SIGFE dn_comp =3D __dn_comp SIGFE diff --git a/winsup/cygwin/x86_64.din b/winsup/cygwin/x86_64.din deleted file mode 100644 index b0b6f6b78..000000000 --- a/winsup/cygwin/x86_64.din +++ /dev/null @@ -1,11 +0,0 @@ -LIBRARY "cygwin1.dll" BASE=3D0x180040000 - -EXPORTS -#Exported functions -__wrap__Znam NOSIGFE # void *operator new[](std::size_t sz)= throw (std::bad_alloc) -__wrap__ZnamRKSt9nothrow_t NOSIGFE # void *operator new[](std::size_t sz,= const std::nothrow_t &nt) throw() -__wrap__Znwm NOSIGFE # void *operator new(std::size_t sz) t= hrow (std::bad_alloc) -__wrap__ZnwmRKSt9nothrow_t NOSIGFE # void *operator new(std::size_t sz, c= onst std::nothrow_t &nt) throw() -_alloca =3D __alloca NOSIGFE -_dll_crt0 NOSIGFE -dll_entry NOSIGFE