|
Lines 1-6
Link Here
|
| 1 |
--- configure.orig 2018-02-08 19:22:54 UTC |
1 |
--- configure.orig 2019-12-12 02:59:10 UTC |
| 2 |
+++ configure |
2 |
+++ configure |
| 3 |
@@ -3248,10 +3248,10 @@ fi |
3 |
@@ -3261,10 +3261,10 @@ fi |
| 4 |
# curses probe |
4 |
# curses probe |
| 5 |
if test "$curses" != "no" ; then |
5 |
if test "$curses" != "no" ; then |
| 6 |
if test "$mingw32" = "yes" ; then |
6 |
if test "$mingw32" = "yes" ; then |
|
Lines 13-15
Link Here
|
| 13 |
curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" |
13 |
curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" |
| 14 |
fi |
14 |
fi |
| 15 |
curses_found=no |
15 |
curses_found=no |
|
|
16 |
@@ -3381,7 +3381,7 @@ for i in $glib_modules; do |
| 17 |
glib_libs=$($pkg_config --libs $i) |
| 18 |
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" |
| 19 |
LIBS="$glib_libs $LIBS" |
| 20 |
- libs_qga="$glib_libs $libs_qga" |
| 21 |
+ libs_qga="$glib_libs -lintl $libs_qga" |
| 22 |
else |
| 23 |
error_exit "glib-$glib_req_ver $i is required to compile QEMU" |
| 24 |
fi |
| 25 |
@@ -5517,27 +5517,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] |
| 26 |
cat > $TMPC <<EOF |
| 27 |
int main(void) { return 0; } |
| 28 |
EOF |
| 29 |
- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" |
| 30 |
+ textseg_ldflags="-Wl,--image-base=$textseg_addr" |
| 31 |
if ! compile_prog "" "$textseg_ldflags"; then |
| 32 |
- # In case ld does not support -Ttext-segment, edit the default linker |
| 33 |
- # script via sed to set the .text start addr. This is needed on FreeBSD |
| 34 |
- # at least. |
| 35 |
- if ! $ld --verbose >/dev/null 2>&1; then |
| 36 |
- error_exit \ |
| 37 |
- "We need to link the QEMU user mode binaries at a" \ |
| 38 |
- "specific text address. Unfortunately your linker" \ |
| 39 |
- "doesn't support either the -Ttext-segment option or" \ |
| 40 |
- "printing the default linker script with --verbose." \ |
| 41 |
- "If you don't want the user mode binaries, pass the" \ |
| 42 |
- "--disable-user option to configure." |
| 43 |
- fi |
| 44 |
+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" |
| 45 |
+ if ! compile_prog "" "$textseg_ldflags"; then |
| 46 |
+ # In case ld does not support -Ttext-segment, edit the default linker |
| 47 |
+ # script via sed to set the .text start addr. This is needed on FreeBSD |
| 48 |
+ # at least. |
| 49 |
+ if ! $ld --verbose >/dev/null 2>&1; then |
| 50 |
+ error_exit \ |
| 51 |
+ "We need to link the QEMU user mode binaries at a" \ |
| 52 |
+ "specific text address. Unfortunately your linker" \ |
| 53 |
+ "doesn't support either the -Ttext-segment option or" \ |
| 54 |
+ "printing the default linker script with --verbose." \ |
| 55 |
+ "If you don't want the user mode binaries, pass the" \ |
| 56 |
+ "--disable-user option to configure." |
| 57 |
+ fi |
| 58 |
|
| 59 |
- $ld --verbose | sed \ |
| 60 |
- -e '1,/==================================================/d' \ |
| 61 |
- -e '/==================================================/,$d' \ |
| 62 |
- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ |
| 63 |
- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld |
| 64 |
- textseg_ldflags="-Wl,-T../config-host.ld" |
| 65 |
+ $ld --verbose | sed \ |
| 66 |
+ -e '1,/==================================================/d' \ |
| 67 |
+ -e '/==================================================/,$d' \ |
| 68 |
+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ |
| 69 |
+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld |
| 70 |
+ textseg_ldflags="-Wl,-T../config-host.ld" |
| 71 |
+ fi |
| 72 |
fi |
| 73 |
fi |
| 74 |
fi |