Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
cdf55b77
Commit
cdf55b77
authored
5 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Default to ms_abi for 64-bit msvcrt builds.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d014b627
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+31
-6
31 additions, 6 deletions
configure
configure.ac
+8
-6
8 additions, 6 deletions
configure.ac
loader/Makefile.in
+1
-1
1 addition, 1 deletion
loader/Makefile.in
with
40 additions
and
13 deletions
configure
+
31
−
6
View file @
cdf55b77
...
...
@@ -17197,8 +17197,8 @@ if test "x$ac_cv_cflags__fshort_wchar" = xyes; then :
fi ;;
esac
case $host_cpu in
*i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
case $host_cpu in
*i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; }
if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then :
$as_echo_n "(cached) " >&6
...
...
@@ -17223,10 +17223,9 @@ $as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; }
if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes; then :
EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer"
fi ;;
esac
case $host in
x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5
*x86_64*)
case $host_os in
cygwin*|mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5
$as_echo_n "checking whether the compiler supports -Wno-format... " >&6; }
if ${ac_cv_cflags__Wno_format+:} false; then :
$as_echo_n "(cached) " >&6
...
...
@@ -17251,6 +17250,32 @@ $as_echo "$ac_cv_cflags__Wno_format" >&6; }
if test "x$ac_cv_cflags__Wno_format" = xyes; then :
EXTRACFLAGS="$EXTRACFLAGS -Wno-format"
fi ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mabi=ms" >&5
$as_echo_n "checking whether the compiler supports -mabi=ms... " >&6; }
if ${ac_cv_cflags__mabi_ms+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS -mabi=ms"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int main(int argc, char **argv) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_cflags__mabi_ms=yes
else
ac_cv_cflags__mabi_ms=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS=$ac_wine_try_cflags_saved
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mabi_ms" >&5
$as_echo "$ac_cv_cflags__mabi_ms" >&6; }
if test "x$ac_cv_cflags__mabi_ms" = xyes; then :
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"
fi ;;
esac ;;
esac
if test "x$enable_maintainer_mode" = "xyes"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
8
−
6
View file @
cdf55b77
...
...
@@ -2022,14 +2022,16 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;;
esac
dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections
case $host_cpu in
dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections
*i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;;
esac
dnl mingw uses Windows 64-bit types, not Unix ones
case $host in
x86_64-*mingw32*|x86_64-*cygwin*) WINE_TRY_CFLAGS([-Wno-format]) ;;
*x86_64*)
case $host_os in
dnl Mingw uses Windows 64-bit types, not Unix ones
cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;;
dnl Default to ms_abi on 64-bit
*) WINE_TRY_CFLAGS([-mabi=ms],[MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"]) ;;
esac ;;
esac
dnl Enable -Werror for maintainer mode
...
...
This diff is collapsed.
Click to expand it.
loader/Makefile.in
+
1
−
1
View file @
cdf55b77
...
...
@@ -14,7 +14,7 @@ SOURCES = \
PROGRAMS
=
$(
WINELOADER_PROGRAMS
)
INSTALL_LIB
=
$(
WINELOADER_PROGRAMS
)
preloader_EXTRADEFS
=
$(
MSVCRTFLAGS
)
preloader_EXTRADEFS
=
-fno-builtin
wine_OBJS
=
main.o
wine_DEPS
=
$(
WINELOADER_DEPENDS
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment