diff options
author | Avi Kivity <avi@redhat.com> | 2011-11-27 14:10:48 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-11-27 14:10:48 +0200 |
commit | c25bd975ea5cac0c562c6c22ef63562d99d5f2b8 (patch) | |
tree | d98fd90b446aedb17f847599ffa44ec76b30e459 | |
parent | a26b6a63a988fe8de1f5f8793c12edc009676014 (diff) | |
parent | bc75c9e50d308b2ec6623a40179c5cdc84b63dae (diff) |
Merge commit 'bc75c9e50d308b2ec6623a40179c5cdc84b63dae' into upstream-merge
* commit 'bc75c9e50d308b2ec6623a40179c5cdc84b63dae':
tci: Add entry to MAINTAINERS
MAINTAINERS: add checkpatch
checkpatch.pl: fix CAST detection
target-xtensa: fix MMUv3 initialization
Update version for 1.0-rc3 release
configure: check for EFD_NONBLOCK | EFD_CLOEXEC flags
configure: build position independent executables on x86-Linux hosts
ivshmem: fix PCI BAR2 registration during initialization
Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r-- | MAINTAINERS | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rwxr-xr-x | configure | 67 | ||||
-rw-r--r-- | hw/ivshmem.c | 2 | ||||
-rwxr-xr-x | scripts/checkpatch.pl | 2 | ||||
-rw-r--r-- | target-xtensa/helper.c | 2 | ||||
-rw-r--r-- | target-xtensa/overlay_tool.h | 2 |
7 files changed, 63 insertions, 24 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7ee301e78..06df70ca8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -485,6 +485,11 @@ S: Maintained F: trace/ T: git://repo.or.cz/qemu/stefanha.git tracing +Checkpatch +M: Blue Swirl <blauwirbel@gmail.com> +S: Odd Fixes +F: scripts/checkpatch.pl + Usermode Emulation ------------------ BSD user @@ -554,3 +559,8 @@ SPARC target M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: tcg/sparc/ + +TCI target +M: Stefan Weil <sw@weilnetz.de> +S: Maintained +F: tcg/tci @@ -1 +1 @@ -0.15.92 +0.15.93 @@ -186,7 +186,7 @@ blobs="yes" pkgversion=" ($(kvm_version))" cpu_emulation="yes" check_utests="" -user_pie="no" +pie="" zero_malloc="" trace_backend="nop" trace_file="trace" @@ -723,9 +723,9 @@ for opt do ;; --disable-guest-base) guest_base="no" ;; - --enable-user-pie) user_pie="yes" + --enable-pie) pie="yes" ;; - --disable-user-pie) user_pie="no" + --disable-pie) pie="no" ;; --enable-uname-release=*) uname_release="$optarg" ;; @@ -1059,8 +1059,8 @@ echo " --disable-bsd-user disable all BSD usermode emulation targets" echo " --enable-guest-base enable GUEST_BASE support for usermode" echo " emulation targets" echo " --disable-guest-base disable GUEST_BASE support" -echo " --enable-user-pie build usermode emulation targets as PIE" -echo " --disable-user-pie do not build usermode emulation targets as PIE" +echo " --enable-pie build Position Independent Executables" +echo " --disable-pie do not build Position Independent Executables" echo " --fmod-lib path to FMOD library" echo " --fmod-inc path to FMOD includes" echo " --oss-lib path to OSS library" @@ -1128,6 +1128,47 @@ for flag in $gcc_flags; do fi done +if test "$static" = "yes" ; then + if test "$pie" = "yes" ; then + echo "static and pie are mutually incompatible" + exit 1 + else + pie="no" + fi +fi + +if test "$pie" = ""; then + case "$cpu-$targetos" in + i386-Linux|x86_64-Linux) + ;; + *) + pie="no" + ;; + esac +fi + +if test "$pie" != "no" ; then + cat > $TMPC << EOF +int main(void) { return 0; } +EOF + if compile_prog "-fPIE -DPIE" "-pie"; then + QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" + LDFLAGS="-pie $LDFLAGS" + pie="yes" + if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then + LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS" + fi + else + if test "$pie" = "yes"; then + echo "PIE not available due to missing toolchain support" + exit 1 + else + echo "Disabling PIE due to missing toolchain support" + pie="no" + fi + fi +fi + # # Solaris specific configure tool chain decisions # @@ -2229,7 +2270,7 @@ cat > $TMPC << EOF int main(void) { - int efd = eventfd(0, 0); + int efd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); return 0; } EOF @@ -2795,7 +2836,7 @@ echo "Documentation $docs" echo "uname -r $uname_release" echo "NPTL support $nptl" echo "GUEST_BASE $guest_base" -echo "PIE user targets $user_pie" +echo "PIE $pie" echo "vde support $vde" echo "Linux AIO support $linux_aio" echo "ATTR/XATTR support $attr" @@ -3262,9 +3303,6 @@ for d in libdis libdis-user; do symlink $source_path/Makefile.dis $d/Makefile echo > $d/config.mak done -if test "$static" = "no" -a "$user_pie" = "yes" ; then - echo "QEMU_CFLAGS+=-fpie" > libdis-user/config.mak -fi for target in $target_list; do target_dir="$target" @@ -3690,12 +3728,6 @@ if test "$target_softmmu" = "yes" ; then esac fi -if test "$target_user_only" = "yes" -a "$static" = "no" -a \ - "$user_pie" = "yes" ; then - cflags="-fpie $cflags" - ldflags="-pie $ldflags" -fi - if test "$target_softmmu" = "yes" -a \( \ "$TARGET_ARCH" = "microblaze" -o \ "$TARGET_ARCH" = "cris" \) ; then @@ -3819,9 +3851,6 @@ d=libuser mkdir -p $d mkdir -p $d/trace symlink $source_path/Makefile.user $d/Makefile -if test "$static" = "no" -a "$user_pie" = "yes" ; then - echo "QEMU_CFLAGS+=-fpie" > $d/config.mak -fi if test "$docs" = "yes" ; then mkdir -p QMP diff --git a/hw/ivshmem.c b/hw/ivshmem.c index a3a0e9845..7b4dbf66a 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -699,7 +699,7 @@ static int pci_ivshmem_init(PCIDevice *dev) s->peers = g_malloc0(s->nb_peers * sizeof(Peer)); pci_register_bar(&s->dev, 2, - PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem); + PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar); s->eventfd_chr = g_malloc0(s->vectors * sizeof(CharDriverState *)); diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7a71324f6..04ab990cc 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -859,7 +859,7 @@ sub annotate_values { $av_preprocessor = 0; } - } elsif ($cur =~ /^(\(\s*$Type\s*)\)/) { + } elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') { print "CAST($1)\n" if ($dbg_values > 1); push(@av_paren_type, $type); $type = 'C'; diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index fc85815a6..2a0cb1a56 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -273,7 +273,7 @@ static void reset_tlb_mmu_ways56(CPUState *env, entry[6][ei].vaddr = ei << 29; entry[6][ei].paddr = ei << 29; entry[6][ei].asid = 1; - entry[6][ei].attr = 2; + entry[6][ei].attr = 3; } } } diff --git a/target-xtensa/overlay_tool.h b/target-xtensa/overlay_tool.h index 9cef27d03..df19cc96e 100644 --- a/target-xtensa/overlay_tool.h +++ b/target-xtensa/overlay_tool.h @@ -256,7 +256,7 @@ .way_size = { \ (refill_way_size), (refill_way_size), \ (refill_way_size), (refill_way_size), \ - 4, 2, 2, 1, 1, 1, \ + 4, (way56) ? 4 : 2, (way56) ? 8 : 2, 1, 1, 1, \ }, \ .varway56 = (way56), \ .nrefillentries = (refill_way_size) * 4, \ |