Attachment #212364 for bug #244774

View | Details | Raw Unified | Return to bug 244774
Collapse All | Expand All




--- configure.orig	2019-10-01 22:31:44 UTC
+++ configure
@@ -393,7 +393,7 @@ DSOSUF=".so"
 LDFLAGS_SHARED="-shared"

 datadir="\${prefix}/share"
 firmwarepath="\${prefix}/share/qemu-firmware"
 qemu_docdir="\${prefix}/share/doc/qemu"
@@ -471,6 +471,9 @@ numa=""
 tcmalloc="no"
 jemalloc="no"
 replication="yes"

 vxhs=""
 bochs="yes"
 cloop="yes"
@@ -1099,6 +1102,10 @@ for opt do
   ;;
   --enable-vnc-png) vnc_png="yes"
   ;;

   --disable-slirp) slirp="no"
   ;;
   --disable-vde) vde="no"
@@ -2862,6 +2869,14 @@ if ! check_include "ifaddrs.h" ; then
 fi
 
 ##########################################

 # VTE probe
 
 if test "$vte" != "no"; then
@@ -4515,11 +4530,6 @@ fi
 if test "$docs" != "no" ; then
   if has makeinfo && has pod2man; then
     docs=yes

   fi
 fi
 
@@ -5033,7 +5043,51 @@ if test "$debug_stack_usage" = "yes"; then
   fi
 fi
 

 ##########################################
 # check if we have open_by_handle_at
 
@@ -5922,27 +5976,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] 
     cat > $TMPC <<EOF
     int main(void) { return 0; }
 EOF
-    textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
+    textseg_ldflags="-Wl,--image-base=$textseg_addr"
     if ! compile_prog "" "$textseg_ldflags"; then
-      # In case ld does not support -Ttext-segment, edit the default linker
-      # script via sed to set the .text start addr.  This is needed on FreeBSD
-      # at least.
-      if ! $ld --verbose >/dev/null 2>&1; then
-        error_exit \
-            "We need to link the QEMU user mode binaries at a" \
-            "specific text address. Unfortunately your linker" \
-            "doesn't support either the -Ttext-segment option or" \
-            "printing the default linker script with --verbose." \
-            "If you don't want the user mode binaries, pass the" \
-            "--disable-user option to configure."
-      fi
+      textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
+      if ! compile_prog "" "$textseg_ldflags"; then
+        # In case ld does not support -Ttext-segment, edit the default linker
+        # script via sed to set the .text start addr.  This is needed on FreeBSD
+        # at least.
+        if ! $ld --verbose >/dev/null 2>&1; then
+          error_exit \
+              "We need to link the QEMU user mode binaries at a" \
+              "specific text address. Unfortunately your linker" \
+              "doesn't support either the -Ttext-segment option or" \
+              "printing the default linker script with --verbose." \
+              "If you don't want the user mode binaries, pass the" \
+              "--disable-user option to configure."
+        fi
 
-      $ld --verbose | sed \
-        -e '1,/==================================================/d' \
-        -e '/==================================================/,$d' \
-        -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
-        -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
-      textseg_ldflags="-Wl,-T../config-host.ld"
+        $ld --verbose | sed \
+          -e '1,/==================================================/d' \
+          -e '/==================================================/,$d' \
+          -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
+          -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
+        textseg_ldflags="-Wl,-T../config-host.ld"
+      fi
     fi
   fi
 fi
@@ -6054,6 +6111,7 @@ echo "Audio drivers     $audio_drv_list"
 echo "Block whitelist (rw) $block_drv_rw_whitelist"
 echo "Block whitelist (ro) $block_drv_ro_whitelist"
 echo "VirtFS support    $virtfs"

 echo "Multipath support $mpath"
 echo "VNC support       $vnc"
 if test "$vnc" = "yes" ; then
@@ -6289,6 +6347,15 @@ fi
 if test "$profiler" = "yes" ; then
   echo "CONFIG_PROFILER=y" >> $config_host_mak
 fi

 if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=y" >> $config_host_mak
   echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
@@ -6519,6 +6586,9 @@ fi
 # if this macro is set.
 if test "$have_fsxattr" = "yes" ; then
     echo "HAVE_FSXATTR=y" >> $config_host_mak

Return to bug 244774

Lines 1-4 Link Here

(-)emulators/qemu31/files/patch-configure (-9 / +59 lines)
1	--- configure.orig 2018-12-11 17:44:34 UTC	1	--- configure.orig 2019-10-01 22:31:44 UTC
2	+++ configure	2	+++ configure
3	@@ -393,7 +393,7 @@ DSOSUF=".so"	3	@@ -393,7 +393,7 @@ DSOSUF=".so"
4	LDFLAGS_SHARED="-shared"	4	LDFLAGS_SHARED="-shared"
Lines 9-15 Link Here
9	datadir="\${prefix}/share"	9	datadir="\${prefix}/share"
10	firmwarepath="\${prefix}/share/qemu-firmware"	10	firmwarepath="\${prefix}/share/qemu-firmware"
11	qemu_docdir="\${prefix}/share/doc/qemu"	11	qemu_docdir="\${prefix}/share/doc/qemu"
12	@@ -469,6 +469,9 @@ numa=""	12	@@ -471,6 +471,9 @@ numa=""
13	tcmalloc="no"	13	tcmalloc="no"
14	jemalloc="no"	14	jemalloc="no"
15	replication="yes"	15	replication="yes"
Lines 19-25 Link Here
19	vxhs=""	19	vxhs=""
20	bochs="yes"	20	bochs="yes"
21	cloop="yes"	21	cloop="yes"
22	@@ -1097,6 +1100,10 @@ for opt do	22	@@ -1099,6 +1102,10 @@ for opt do
23	;;	23	;;
24	--enable-vnc-png) vnc_png="yes"	24	--enable-vnc-png) vnc_png="yes"
25	;;	25	;;
Lines 30-36 Link Here
30	--disable-slirp) slirp="no"	30	--disable-slirp) slirp="no"
31	;;	31	;;
32	--disable-vde) vde="no"	32	--disable-vde) vde="no"
33	@@ -2860,6 +2867,14 @@ if ! check_include "ifaddrs.h" ; then	33	@@ -2862,6 +2869,14 @@ if ! check_include "ifaddrs.h" ; then
34	fi	34	fi
35		35
36	##########################################	36	##########################################
Lines 45-51 Link Here
45	# VTE probe	45	# VTE probe
46		46
47	if test "$vte" != "no"; then	47	if test "$vte" != "no"; then
48	@@ -4466,11 +4481,6 @@ fi	48	@@ -4515,11 +4530,6 @@ fi
49	if test "$docs" != "no" ; then	49	if test "$docs" != "no" ; then
50	if has makeinfo && has pod2man; then	50	if has makeinfo && has pod2man; then
51	docs=yes	51	docs=yes
Lines 57-63 Link Here
57	fi	57	fi
58	fi	58	fi
59		59
60	@@ -4984,7 +4994,51 @@ if test "$debug_stack_usage" = "yes"; then	60	@@ -5033,7 +5043,51 @@ if test "$debug_stack_usage" = "yes"; then
61	fi	61	fi
62	fi	62	fi
63		63
Lines 109-115 Link Here
109	##########################################	109	##########################################
110	# check if we have open_by_handle_at	110	# check if we have open_by_handle_at
111		111
112	@@ -6005,6 +6059,7 @@ echo "Audio drivers $audio_drv_list"	112	@@ -5922,27 +5976,30 @@ if ( [ "$linux_user" = yes ] \|\| [ "$bsd_user" = yes ]
		113	cat > $TMPC <<EOF
		114	int main(void) { return 0; }
		115	EOF
		116	- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
		117	+ textseg_ldflags="-Wl,--image-base=$textseg_addr"
		118	if ! compile_prog "" "$textseg_ldflags"; then
		119	- # In case ld does not support -Ttext-segment, edit the default linker
		120	- # script via sed to set the .text start addr. This is needed on FreeBSD
		121	- # at least.
		122	- if ! $ld --verbose >/dev/null 2>&1; then
		123	- error_exit \
		124	- "We need to link the QEMU user mode binaries at a" \
		125	- "specific text address. Unfortunately your linker" \
		126	- "doesn't support either the -Ttext-segment option or" \
		127	- "printing the default linker script with --verbose." \
		128	- "If you don't want the user mode binaries, pass the" \
		129	- "--disable-user option to configure."
		130	- fi
		131	+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
		132	+ if ! compile_prog "" "$textseg_ldflags"; then
		133	+ # In case ld does not support -Ttext-segment, edit the default linker
		134	+ # script via sed to set the .text start addr. This is needed on FreeBSD
		135	+ # at least.
		136	+ if ! $ld --verbose >/dev/null 2>&1; then
		137	+ error_exit \
		138	+ "We need to link the QEMU user mode binaries at a" \
		139	+ "specific text address. Unfortunately your linker" \
		140	+ "doesn't support either the -Ttext-segment option or" \
		141	+ "printing the default linker script with --verbose." \
		142	+ "If you don't want the user mode binaries, pass the" \
		143	+ "--disable-user option to configure."
		144	+ fi
		145
		146	- $ld --verbose \| sed \
		147	- -e '1,/==================================================/d' \
		148	- -e '/==================================================/,$d' \
		149	- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
		150	- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
		151	- textseg_ldflags="-Wl,-T../config-host.ld"
		152	+ $ld --verbose \| sed \
		153	+ -e '1,/==================================================/d' \
		154	+ -e '/==================================================/,$d' \
		155	+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
		156	+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
		157	+ textseg_ldflags="-Wl,-T../config-host.ld"
		158	+ fi
		159	fi
		160	fi
		161	fi
		162	@@ -6054,6 +6111,7 @@ echo "Audio drivers $audio_drv_list"
113	echo "Block whitelist (rw) $block_drv_rw_whitelist"	163	echo "Block whitelist (rw) $block_drv_rw_whitelist"
114	echo "Block whitelist (ro) $block_drv_ro_whitelist"	164	echo "Block whitelist (ro) $block_drv_ro_whitelist"
115	echo "VirtFS support $virtfs"	165	echo "VirtFS support $virtfs"
Lines 117-123 Link Here
117	echo "Multipath support $mpath"	167	echo "Multipath support $mpath"
118	echo "VNC support $vnc"	168	echo "VNC support $vnc"
119	if test "$vnc" = "yes" ; then	169	if test "$vnc" = "yes" ; then
120	@@ -6240,6 +6295,15 @@ fi	170	@@ -6289,6 +6347,15 @@ fi
121	if test "$profiler" = "yes" ; then	171	if test "$profiler" = "yes" ; then
122	echo "CONFIG_PROFILER=y" >> $config_host_mak	172	echo "CONFIG_PROFILER=y" >> $config_host_mak
123	fi	173	fi
Lines 133-139 Link Here
133	if test "$slirp" = "yes" ; then	183	if test "$slirp" = "yes" ; then
134	echo "CONFIG_SLIRP=y" >> $config_host_mak	184	echo "CONFIG_SLIRP=y" >> $config_host_mak
135	echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak	185	echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
136	@@ -6470,6 +6534,9 @@ fi	186	@@ -6519,6 +6586,9 @@ fi
137	# if this macro is set.	187	# if this macro is set.
138	if test "$have_fsxattr" = "yes" ; then	188	if test "$have_fsxattr" = "yes" ; then
139	echo "HAVE_FSXATTR=y" >> $config_host_mak	189	echo "HAVE_FSXATTR=y" >> $config_host_mak