marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Move DECLSPEC_HOTPATCH definition out of config.h. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-05-02 16:47:55 +02:00
parent 60ac1cec62
commit d624883047
4 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure vendored
View File

@ -17234,44 +17234,6 @@ $as_echo "$ac_cv_cflags__Werror" >&6; }
if test "x$ac_cv_cflags__Werror" = xyes; then :
EXTRACFLAGS="$EXTRACFLAGS -Werror"
fi
fi
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_hook_prologue attribute" >&5
$as_echo_n "checking for ms_hook_prologue attribute... " >&6; }
if ${ac_cv_have_ms_hook_prologue+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_ms_hook_prologue="yes"
else
ac_cv_have_ms_hook_prologue="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ms_hook_prologue" >&5
$as_echo "$ac_cv_have_ms_hook_prologue" >&6; }
CFLAGS="$saved_CFLAGS"
if test "$ac_cv_have_ms_hook_prologue" = "yes"
then
$as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>confdefs.h
else
$as_echo "#define DECLSPEC_HOTPATCH /* */" >>confdefs.h
fi
fi

15
configure.ac
View File

@ -2031,21 +2031,6 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
then
WINE_TRY_CFLAGS([-Werror])
fi
dnl Check for ms_hook_prologue support
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
AC_CACHE_CHECK([for ms_hook_prologue attribute], ac_cv_have_ms_hook_prologue,
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])],
[ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"]))
CFLAGS="$saved_CFLAGS"
if test "$ac_cv_have_ms_hook_prologue" = "yes"
then
AC_DEFINE(DECLSPEC_HOTPATCH, [__attribute__((__ms_hook_prologue__))],
[Define to a function attribute for Microsoft hotpatch assembly prefix.])
else
AC_DEFINE(DECLSPEC_HOTPATCH, [/* */])
fi
fi
dnl **** Disable Fortify, it has too many false positives

3
include/config.h.in
View File

@ -4,9 +4,6 @@
#define __WINE_CONFIG_H
#ifndef WINE_CROSSTEST
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
#undef DECLSPEC_HOTPATCH
/* Define to the file extension for executables. */
#undef EXEEXT

6
include/winnt.h
View File

@ -162,6 +162,12 @@ extern "C" {
# define DECLSPEC_HIDDEN
#endif
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))) && (defined(__i386__) || defined(__x86_64__))
#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))
#else
#define DECLSPEC_HOTPATCH
#endif
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
#else