From: Richard Henderson <rth@twiddle.net>
Date: Mon, 15 Jul 2013 20:21:10 +0000 (-0700)
Subject: Merge git://github.com/hw-claudio/qemu-aarch64-queue into tcg-next
X-Git-Tag: v1.6.0-rc0~57^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f290e4988dd8eb012de0517a1ff93df130e87da1;hp=-c;p=qemu.git

Merge git://github.com/hw-claudio/qemu-aarch64-queue into tcg-next
---

f290e4988dd8eb012de0517a1ff93df130e87da1
diff --combined configure
index cb0f870b9,8e425ba6e..0214bbc54
--- a/configure
+++ b/configure
@@@ -3445,36 -3445,6 +3445,36 @@@ if test "$cpu" = "s390x" ; the
    roms="$roms s390-ccw"
  fi
  
 +# Probe for the need for relocating the user-only binary.
 +if test "$pie" = "no" ; then
 +  textseg_addr=
 +  case "$cpu" in
 +    arm | hppa | i386 | m68k | ppc | ppc64 | s390* | sparc | sparc64 | x86_64)
 +      textseg_addr=0x60000000
 +      ;;
 +    mips)
 +      textseg_addr=0x400000
 +      ;;
 +  esac
 +  if [ -n "$textseg_addr" ]; then
 +    cat > $TMPC <<EOF
 +    int main(void) { return 0; }
 +EOF
 +    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.
 +      $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
 +
  # add pixman flags after all config tests are done
  QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
  libs_softmmu="$libs_softmmu $pixman_libs"
@@@ -3624,7 -3594,7 +3624,7 @@@ echo "libs_softmmu=$libs_softmmu" >> $c
  echo "ARCH=$ARCH" >> $config_host_mak
  
  case "$cpu" in
-   arm|i386|x86_64|ppc)
+   arm|i386|x86_64|ppc|aarch64)
      # The TCG interpreter currently does not support ld/st optimization.
      if test "$tcg_interpreter" = "no" ; then
          echo "CONFIG_QEMU_LDST_OPTIMIZATION=y" >> $config_host_mak
@@@ -4103,6 -4073,9 +4103,6 @@@ if test "$gcov" = "yes" ; the
    echo "GCOV=$gcov_tool" >> $config_host_mak
  fi
  
 -# generate list of library paths for linker script
 -$ld --verbose -v 2> /dev/null | grep SEARCH_DIR > config-host.ld
 -
  # use included Linux headers
  if test "$linux" = "yes" ; then
    mkdir -p linux-headers
@@@ -4465,8 -4438,21 +4465,8 @@@ if test "$gprof" = "yes" ; the
    fi
  fi
  
 -if test "$ARCH" = "tci"; then
 -  linker_script=""
 -else
 -  linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/ldscripts/\$(ARCH).ld"
 -fi
 -
  if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
 -  case "$ARCH" in
 -  alpha | s390x | aarch64)
 -    # The default placement of the application is fine.
 -    ;;
 -  *)
 -    ldflags="$linker_script $ldflags"
 -    ;;
 -  esac
 +  ldflags="$ldflags $textseg_ldflags"
  fi
  
  echo "LDFLAGS+=$ldflags" >> $config_target_mak