diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2022-08-08 18:47:46 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2022-08-08 18:47:46 +0300 |
commit | 3ba050dfcd1d7e1462edf8b7c3d557f09ed993a6 (patch) | |
tree | 05c661a4f93867110f6d21f1d8ff10cae47c28b3 /winsup | |
parent | 5858c2301521b2422dad46a93f45500b63f4a760 (diff) |
Cygwin: fold common.din and x86_64.din into cygwin.din
We don't need a target-specific DEF file anymore
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/configure.ac | 2 | ||||
-rw-r--r-- | winsup/cygwin/Makefile.am | 5 | ||||
-rw-r--r-- | winsup/cygwin/cygwin.din (renamed from winsup/cygwin/common.din) | 10 | ||||
-rw-r--r-- | 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 ]) DLL_ENTRY="dll_entry" -DIN_FILE="${target_cpu}.din" case "$target_cpu" in x86_64) ;; @@ -74,7 +73,6 @@ case "$target_cpu" in esac AC_SUBST(DLL_ENTRY) -AC_SUBST(DIN_FILE) AM_CONDITIONAL(TARGET_X86_64, [test $target_cpu = "x86_64"]) 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=cygwin1.dll PRE_DLL_NAME=cygwin0.dll DBG_DLL_NAME=cygwin1.dbg NEW_DLL_NAME=new-cygwin1.dll -DIN_FILE=@DIN_FILE@ DEF_FILE=cygwin.def LIB_NAME=libcygwin.a TEST_LIB_NAME=libcygwin0.a @@ -622,8 +621,8 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME) # cygwin import library toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@ -$(DEF_FILE): scripts/gendef $(DIN_FILE) common.din - $(AM_V_GEN)$(srcdir)/scripts/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din +$(DEF_FILE): scripts/gendef cygwin.din + $(AM_V_GEN)$(srcdir)/scripts/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) $(srcdir)/cygwin.din sigfe.s: $(DEF_FILE) tlsoffsets @[ -s $@ ] || \ diff --git a/winsup/cygwin/common.din b/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=0x180040000 + +EXPORTS # Exported variables __argc DATA __argv DATA @@ -122,10 +125,16 @@ __wrap__ZdaPv NOSIGFE # void operator delete[](void *p) throw() __wrap__ZdaPvRKSt9nothrow_t NOSIGFE # void operator delete[](void *p, const 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) throw (std::bad_alloc) +__wrap__ZnwmRKSt9nothrow_t NOSIGFE # void *operator new(std::size_t sz, const std::nothrow_t &nt) throw() __xdrrec_getrec SIGFE __xdrrec_setnonblock SIGFE __xpg_sigpause SIGFE __xpg_strerror_r SIGFE +_alloca = __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 = __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=0x180040000 - -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) throw (std::bad_alloc) -__wrap__ZnwmRKSt9nothrow_t NOSIGFE # void *operator new(std::size_t sz, const std::nothrow_t &nt) throw() -_alloca = __alloca NOSIGFE -_dll_crt0 NOSIGFE -dll_entry NOSIGFE |