Comment 5 for bug 1258168

Revision history for this message
Don Slutz (dslutz) wrote :

My testing of this patch is that it does not help.

  LINK qemu-bridge-helper
  CC qmp-marshal.o
lt LINK vscclient
/usr/bin/ld: -f may not be used without -shared
collect2: ld returned 1 exit status
make: *** [vscclient] Error 1
make: *** Waiting for unfinished jobs....
dcs-xen-53:~/qemu/out/bug-1258168>git show
commit cceddd04255cdacacf91562d43fdb7afcec91242
Author: Paolo Bonzini <email address hidden>
Date: Thu Nov 13 16:34:16 2014 +0000

    configure: test patch for 1258168

diff --git a/configure b/configure
index 47048f0..b7bf30a 100755
--- a/configure
+++ b/configure
@@ -140,8 +140,10 @@ do_libtool() {
 }

 libtool_prog() {
- do_libtool --mode=compile $QEMU_CFLAGS -c -fPIE -DPIE -o $TMPO $TMPC || return $?
- do_libtool --mode=link $LDFLAGS -o $TMPA $TMPL -rpath /usr/local/lib
+ local_cflags="$1"
+ local_ldflags="$2"
+ do_libtool --mode=compile $QEMU_CFLAGS $local_cflags -c -fPIE -DPIE -o $TMPO $TMPC || return $?
+ do_libtool --mode=link $LDFLAGS $local_ldflags -o $TMPA $TMPL -rpath /usr/local/lib
 }

 # symbolically link $1 to $2. Portable version of "ln -sf".
@@ -1501,13 +1503,16 @@ if test "$stack_protector" != "no"; then
   for flag in $gcc_flags; do
     # We need to check both a compile and a link, since some compiler
     # setups fail only on a .c->.o compile and some only at link time
- if do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC &&
- compile_prog "-Werror $flag" ""; then
- QEMU_CFLAGS="$QEMU_CFLAGS $flag"
- LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"
- sp_on=1
- break
+ do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC || continue
+ compile_prog "-Werror $flag" "" || continue
+ if test -n "$libtool"; then
+ libtool_prog "-Werror $flag" "-Wc,$flag" || continue
     fi
+
+ QEMU_CFLAGS="$QEMU_CFLAGS $flag"
+ LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"
+ sp_on=1
+ break
   done
   if test "$stack_protector" = yes; then
     if test $sp_on = 0; then
@@ -1608,7 +1613,7 @@ g(unsigned char *buf, int len)
 }

 EOF
- if ! libtool_prog; then
+ if ! libtool_prog "" ""; then
     echo "Disabling libtool due to broken toolchain support"
     libtool=
   fi
dcs-xen-53:~/qemu/out/bug-1258168>git log -2
commit cceddd04255cdacacf91562d43fdb7afcec91242
Author: Paolo Bonzini <email address hidden>
Date: Thu Nov 13 16:34:16 2014 +0000

    configure: test patch for 1258168

commit b56cb288954d900dec79cc55128efa61bebf6178
Merge: e08d300 953ea14
Author: Peter Maydell <email address hidden>
Date: Thu Nov 13 13:02:31 2014 +0000

    Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-1.7.5.1-20141113-1' into staging

    update seabios to 1.7.5.1 stable release

    # gpg: Signature made Thu 13 Nov 2014 11:03:05 GMT using RSA key ID D3E87138
    # gpg: Good signature from "Gerd Hoffmann (work) <email address hidden>"
    # gpg: aka "Gerd Hoffmann <email address hidden>"
    # gpg: aka "Gerd Hoffmann (private) <email address hidden>"

    * remotes/kraxel/tags/pull-seabios-1.7.5.1-20141113-1:
      update seabios to 1.7.5.1 stable release

    Signed-off-by: Peter Maydell <email address hidden>