From 2d0998e48ef1740529ef4463814d8aebbd1b44e2 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Mon, 8 Oct 2018 21:09:12 +0100 Subject: [PATCH] Suppress autoconf detection of _aligned_malloc functions. --- mingwrt/ChangeLog | 8 ++++++++ mingwrt/msvcrt-xref/msvcrt.def.in | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog index d6ff210..637c78a 100644 --- a/mingwrt/ChangeLog +++ b/mingwrt/ChangeLog @@ -1,3 +1,11 @@ +2018-10-08 Keith Marshall + + Suppress autoconf detection of _aligned_malloc functions. + + * msvcrt-xref/msvcrt.def.in (_aligned_malloc, _aligned_free) + (_aligned_offset_malloc, _aligned_realloc, _aligned_offset_realloc): + Mark as requiring dlsym() lookup, when linking with MSVCRT.DLL + 2018-10-07 Keith Marshall Make alloca() API both GNU and Microsoft compatible. diff --git a/mingwrt/msvcrt-xref/msvcrt.def.in b/mingwrt/msvcrt-xref/msvcrt.def.in index 5936ce2..0061bb8 100644 --- a/mingwrt/msvcrt-xref/msvcrt.def.in +++ b/mingwrt/msvcrt-xref/msvcrt.def.in @@ -5,7 +5,7 @@ * definition files, supporting multiple OS platform versions. * * Compiled by Keith Marshall - * Copyright (C) 2014, 2016, MinGW.org Project. + * Copyright (C) 2014, 2016, 2018, MinGW.org Project. * * * Permission is hereby granted, free of charge, to any person obtaining a @@ -555,27 +555,27 @@ _adjust_fdiv DATA _aexit_rtn DATA #endif #if __MSVCRT_VERSION__ >= 0x0501UL -_aligned_free +__MINGW_DLSYM(_aligned_free) # if __MSVCRT_VERSION__ >= 0x0600UL && __MSVCRT_VERSION__ < 0x07000000UL _aligned_free_dbg # endif -_aligned_malloc +__MINGW_DLSYM(_aligned_malloc) # if __MSVCRT_VERSION__ >= 0x0600UL && __MSVCRT_VERSION__ < 0x07000000UL _aligned_malloc_dbg # elif __MSVCRT_VERSION__ >= 0x08000000UL _aligned_msize # endif -_aligned_offset_malloc +__MINGW_DLSYM(_aligned_offset_malloc) # if __MSVCRT_VERSION__ >= 0x0600UL && __MSVCRT_VERSION__ < 0x07000000UL _aligned_offset_malloc_dbg # endif -_aligned_offset_realloc +__MINGW_DLSYM(_aligned_offset_realloc) # if __MSVCRT_VERSION__ >= 0x0600UL && __MSVCRT_VERSION__ < 0x07000000UL _aligned_offset_realloc_dbg # elif __MSVCRT_VERSION__ >= 0x08000000UL _aligned_offset_recalloc # endif -_aligned_realloc +__MINGW_DLSYM(_aligned_realloc) # if __MSVCRT_VERSION__ >= 0x0600UL && __MSVCRT_VERSION__ < 0x07000000UL _aligned_realloc_dbg # elif __MSVCRT_VERSION__ >= 0x08000000UL -- 2.11.0