From d6242d87336d7f06691d1e1d9a3ce9324fd9903c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 30 May 2020 19:41:18 +0200 Subject: [PATCH] Cygwin: update C++ dialect to gnu++14 Disable -std option since gnu++14 is default anyway, but keep it available as comment. Update dynamic exception specifications deprecated with C++11 to C++11-introduced noexcept expression. Signed-off-by: Corinna Vinschen --- winsup/cygwin/Makefile.in | 2 +- winsup/cygwin/lib/_cygwin_crt0_common.cc | 16 ++++++------ winsup/cygwin/libstdcxx_wrapper.cc | 32 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 0ec90de58..9bbdf8cc3 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -77,7 +77,7 @@ COMMON_CFLAGS=-MMD ${$(*F)_CFLAGS} -Werror -fmerge-constants -ftracer $(CCEXTRA) ifeq ($(target_cpu),x86_64) COMMON_CFLAGS+=-mcmodel=small endif -COMPILE.cc+=${COMMON_CFLAGS} -std=gnu++98 +COMPILE.cc+=${COMMON_CFLAGS} # -std=gnu++14 COMPILE.c+=${COMMON_CFLAGS} AR:=@AR@ diff --git a/winsup/cygwin/lib/_cygwin_crt0_common.cc b/winsup/cygwin/lib/_cygwin_crt0_common.cc index c7e4eeac4..025e2f2ee 100644 --- a/winsup/cygwin/lib/_cygwin_crt0_common.cc +++ b/winsup/cygwin/lib/_cygwin_crt0_common.cc @@ -34,21 +34,21 @@ details. */ references to these operators toward the redirectors in the Cygwin DLL; this way we can record what definitions were visible at final link time but still send all calls to the redirectors. */ -extern WEAK void *operator new(std::size_t sz) throw (std::bad_alloc) +extern WEAK void *operator new(std::size_t sz) noexcept (false) __asm__ (REAL_ZNWX); -extern WEAK void *operator new[](std::size_t sz) throw (std::bad_alloc) +extern WEAK void *operator new[](std::size_t sz) noexcept (false) __asm__ (REAL_ZNAX); -extern WEAK void operator delete(void *p) throw() +extern WEAK void operator delete(void *p) noexcept (true) __asm__ (REAL_ZDLPV); -extern WEAK void operator delete[](void *p) throw() +extern WEAK void operator delete[](void *p) noexcept (true) __asm__ (REAL_ZDAPV); -extern WEAK void *operator new(std::size_t sz, const std::nothrow_t &nt) throw() +extern WEAK void *operator new(std::size_t sz, const std::nothrow_t &nt) noexcept (true) __asm__ (REAL_ZNWX_NOTHROW_T); -extern WEAK void *operator new[](std::size_t sz, const std::nothrow_t &nt) throw() +extern WEAK void *operator new[](std::size_t sz, const std::nothrow_t &nt) noexcept (true) __asm__ (REAL_ZNAX_NOTHROW_T); -extern WEAK void operator delete(void *p, const std::nothrow_t &nt) throw() +extern WEAK void operator delete(void *p, const std::nothrow_t &nt) noexcept (true) __asm__ (REAL_ZDLPV_NOTHROW_T); -extern WEAK void operator delete[](void *p, const std::nothrow_t &nt) throw() +extern WEAK void operator delete[](void *p, const std::nothrow_t &nt) noexcept (true) __asm__ (REAL_ZDAPV_NOTHROW_T); /* Avoid an info message from linker when linking applications. */ diff --git a/winsup/cygwin/libstdcxx_wrapper.cc b/winsup/cygwin/libstdcxx_wrapper.cc index 6cd4c754d..2c41b3759 100644 --- a/winsup/cygwin/libstdcxx_wrapper.cc +++ b/winsup/cygwin/libstdcxx_wrapper.cc @@ -32,67 +32,67 @@ details. */ #define MANGLED_ZNAX_NOTHROW_T "___wrap__ZnajRKSt9nothrow_t" #endif -extern void *operator new(std::size_t sz) throw (std::bad_alloc) +extern void *operator new(std::size_t sz) noexcept (false) __asm__ (MANGLED_ZNWX); -extern void *operator new[](std::size_t sz) throw (std::bad_alloc) +extern void *operator new[](std::size_t sz) noexcept (false) __asm__ (MANGLED_ZNAX); -extern void operator delete(void *p) throw() +extern void operator delete(void *p) noexcept (true) __asm__ (_SYMSTR (__wrap__ZdlPv)); -extern void operator delete[](void *p) throw() +extern void operator delete[](void *p) noexcept (true) __asm__ (_SYMSTR (__wrap__ZdaPv)); -extern void *operator new(std::size_t sz, const std::nothrow_t &nt) throw() +extern void *operator new(std::size_t sz, const std::nothrow_t &nt) noexcept (true) __asm__ (MANGLED_ZNWX_NOTHROW_T); -extern void *operator new[](std::size_t sz, const std::nothrow_t &nt) throw() +extern void *operator new[](std::size_t sz, const std::nothrow_t &nt) noexcept (true) __asm__ (MANGLED_ZNAX_NOTHROW_T); -extern void operator delete(void *p, const std::nothrow_t &nt) throw() +extern void operator delete(void *p, const std::nothrow_t &nt) noexcept (true) __asm__ (_SYMSTR (__wrap__ZdlPvRKSt9nothrow_t)); -extern void operator delete[](void *p, const std::nothrow_t &nt) throw() +extern void operator delete[](void *p, const std::nothrow_t &nt) noexcept (true) __asm__ (_SYMSTR (__wrap__ZdaPvRKSt9nothrow_t)); extern void * -operator new(std::size_t sz) throw (std::bad_alloc) +operator new(std::size_t sz) noexcept (false) { return (*user_data->cxx_malloc->oper_new) (sz); } extern void * -operator new[](std::size_t sz) throw (std::bad_alloc) +operator new[](std::size_t sz) noexcept (false) { return (*user_data->cxx_malloc->oper_new__) (sz); } extern void -operator delete(void *p) throw() +operator delete(void *p) noexcept (true) { (*user_data->cxx_malloc->oper_delete) (p); } extern void -operator delete[](void *p) throw() +operator delete[](void *p) noexcept (true) { (*user_data->cxx_malloc->oper_delete__) (p); } extern void * -operator new(std::size_t sz, const std::nothrow_t &nt) throw() +operator new(std::size_t sz, const std::nothrow_t &nt) noexcept (true) { return (*user_data->cxx_malloc->oper_new_nt) (sz, nt); } extern void * -operator new[](std::size_t sz, const std::nothrow_t &nt) throw() +operator new[](std::size_t sz, const std::nothrow_t &nt) noexcept (true) { return (*user_data->cxx_malloc->oper_new___nt) (sz, nt); } extern void -operator delete(void *p, const std::nothrow_t &nt) throw() +operator delete(void *p, const std::nothrow_t &nt) noexcept (true) { (*user_data->cxx_malloc->oper_delete_nt) (p, nt); } extern void -operator delete[](void *p, const std::nothrow_t &nt) throw() +operator delete[](void *p, const std::nothrow_t &nt) noexcept (true) { (*user_data->cxx_malloc->oper_delete___nt) (p, nt); } -- 2.43.5