Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
1df39554
Commit
1df39554
authored
Mar 28, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Move the main loader base address to cope with huge page alignment.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e5939520
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
configure
configure
+11
-11
configure.ac
configure.ac
+3
-3
No files found.
configure
View file @
1df39554
...
@@ -8575,35 +8575,35 @@ $as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; }
...
@@ -8575,35 +8575,35 @@ $as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; }
if
test
"x
$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000
"
=
xyes
;
then
:
if
test
"x
$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000
"
=
xyes
;
then
:
case
$host_os
in
case
$host_os
in
freebsd
*
|
kfreebsd
*
-gnu
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,-Ttext-segment=0x60000000"
;;
freebsd
*
|
kfreebsd
*
-gnu
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,-Ttext-segment=0x60000000"
;;
*
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,-Ttext-segment=0x7
bf
00000"
;;
*
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,-Ttext-segment=0x7
c0
00000"
;;
esac
esac
else
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--section-start,.interp=0x7
bf
00400"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--section-start,.interp=0x7
c0
00400"
>
&5
$as_echo_n
"checking whether the compiler supports -Wl,--section-start,.interp=0x7
bf
00400... "
>
&6
;
}
$as_echo_n
"checking whether the compiler supports -Wl,--section-start,.interp=0x7
c0
00400... "
>
&6
;
}
if
${
ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
+
:
}
false
;
then
:
if
${
ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
$as_echo_n
"(cached) "
>
&6
else
else
ac_wine_try_cflags_saved
=
$CFLAGS
ac_wine_try_cflags_saved
=
$CFLAGS
CFLAGS
=
"
$CFLAGS
-Wl,--section-start,.interp=0x7
bf
00400"
CFLAGS
=
"
$CFLAGS
-Wl,--section-start,.interp=0x7
c0
00400"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
/* end confdefs.h. */
int main(int argc, char **argv) { return 0; }
int main(int argc, char **argv) { return 0; }
_ACEOF
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
=
yes
ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
=
yes
else
else
ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
=
no
ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
=
no
fi
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
CFLAGS
=
$ac_wine_try_cflags_saved
fi
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
"
>
&5
$as_echo
"
$ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
"
>
&6
;
}
$as_echo
"
$ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
"
>
&6
;
}
if
test
"x
$ac_cv_cflags__Wl___section_start__interp_0x7
bf
00400
"
=
xyes
;
then
:
if
test
"x
$ac_cv_cflags__Wl___section_start__interp_0x7
c0
00400
"
=
xyes
;
then
:
case
$host_os
in
case
$host_os
in
freebsd
*
|
kfreebsd
*
-gnu
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,--section-start,.interp=0x60000400"
;;
freebsd
*
|
kfreebsd
*
-gnu
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,--section-start,.interp=0x60000400"
;;
*
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,--section-start,.interp=0x7
bf
00400"
;;
*
)
LDEXECFLAGS
=
"
$LDEXECFLAGS
-Wl,--section-start,.interp=0x7
c0
00400"
;;
esac
esac
fi
fi
# Extract the first word of "prelink", so it can be a program name with args.
# Extract the first word of "prelink", so it can be a program name with args.
...
...
configure.ac
View file @
1df39554
...
@@ -898,12 +898,12 @@ case $host_os in
...
@@ -898,12 +898,12 @@ case $host_os in
WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
[case $host_os in
[case $host_os in
freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;;
freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;;
*) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7
bf
00000" ;;
*) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7
c0
00000" ;;
esac],
esac],
[WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7
bf
00400],
[WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7
c0
00400],
[case $host_os in
[case $host_os in
freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;;
freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;;
*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7
bf
00400" ;;
*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7
c0
00400" ;;
esac])
esac])
AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
if test "x$PRELINK" = xfalse
if test "x$PRELINK" = xfalse
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment