From 677630b31b8ce4bd8cb723a4c66414739c9d4331 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Mon, 8 Mar 2010 18:27:13 +0300 Subject: qemu: remove 0.9.x QEMU 0.9.x is obsolete this days and with all modifications made for QEMU 0.10.x in OE, versions 0.9.x are unusable anyway. 0.10.3 was introduced 10 month ago, so a good transition time was also given. Now it's time to just kill it. Also remove cvs and svn versions since those are 0.9.x leftovers and QEMU moved to git long ago. Also remove gcc3 checks since that are not relevant for QEMU 0.10+. Also remove from icecc blacklist, since QEMU builds fine with it and the reason for blacklisting was GCC 3. Signed-off-by: Roman I Khimov Acked-by: Tom Rini Acked-by: Koen Kooi Acked-by: Marcin Juszkiewicz --- classes/icecc.bbclass | 2 +- classes/qemu.bbclass | 12 - classes/sanity.bbclass | 9 - conf/local.conf.sample | 6 - .../02_snapshot_use_tmpdir.patch | 23 - .../03_machines_list_no_error.patch | 18 - .../04_do_not_print_rtc_freq_if_ok.patch | 25 - .../05_non-fatal_if_linux_hd_missing.patch | 17 - .../qemu-0.9.0+cvs20070613/06_exit_segfault.patch | 45 - .../qemu-0.9.0+cvs20070613/10_signal_jobs.patch | 26 - .../11_signal_sigaction.patch | 21 - .../12_signal_powerpc_support.patch | 401 ---- .../22_net_tuntap_stall.patch | 18 - .../qemu-0.9.0+cvs20070613/30_syscall_ipc.patch | 34 - .../qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch | 49 - .../qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch | 56 - .../33_syscall_ppc_clone.patch | 22 - .../39_syscall_fadvise64.patch | 21 - .../qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch | 105 - .../qemu-0.9.0+cvs20070613/52_ne2000_return.patch | 17 - .../qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch | 27 - .../qemu-0.9.0+cvs20070613/63_sparc_build.patch | 18 - .../64_ppc_asm_constraints.patch | 18 - .../qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch | 44 - .../qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch | 55 - .../qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch | 18 - .../qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch | 223 -- recipes/qemu/qemu-0.9.0+cvs20070613/arm_nptl.patch | 857 ------- recipes/qemu/qemu-0.9.0+cvs20070613/compiler.patch | 10 - .../qemu/qemu-0.9.0+cvs20070613/configure.patch | 13 - .../qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch | 46 - recipes/qemu/qemu-0.9.0+cvs20070613/makefile.patch | 37 - recipes/qemu/qemu-0.9.0+cvs20070613/no-strip.patch | 22 - .../qemu/qemu-0.9.0+cvs20070613/pl110_rgb-r0.patch | 219 -- .../qemu-0.9.0-nptl-update.patch | 294 --- .../qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch | 892 -------- .../qemu-amd64-32b-mapping-0.9.0.patch | 31 - .../qemu-pci-irq-sharing.patch | 52 - .../qemu-0.9.0+cvs20070613/qemu-sdl-cursor.patch | 13 - .../qemu-usb-wacom-0.8.2.patch | 445 ---- .../qemu-usb-wacom-buttons.patch | 23 - .../qemu-usb-wacom-pressure.patch | 28 - .../workaround_bad_futex_headers.patch | 25 - .../05_non-fatal_if_linux_hd_missing.patch | 17 - recipes/qemu/qemu-0.9.1+svn/06_exit_segfault.patch | 45 - recipes/qemu/qemu-0.9.1+svn/10_signal_jobs.patch | 26 - .../qemu/qemu-0.9.1+svn/11_signal_sigaction.patch | 21 - .../qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch | 18 - recipes/qemu/qemu-0.9.1+svn/31_syscalls.patch | 48 - .../qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch | 55 - .../qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch | 22 - .../qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch | 21 - recipes/qemu/qemu-0.9.1+svn/52_ne2000_return.patch | 17 - .../qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch | 27 - recipes/qemu/qemu-0.9.1+svn/63_sparc_build.patch | 18 - .../qemu-0.9.1+svn/64_ppc_asm_constraints.patch | 18 - recipes/qemu/qemu-0.9.1+svn/65_kfreebsd.patch | 35 - recipes/qemu/qemu-0.9.1+svn/66_tls_ld.patch | 55 - recipes/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch | 18 - .../qemu-0.9.1+svn/configure_symlinkpath_fix.patch | 28 - .../qemu-0.9.1+svn/fix_baum_c_compilation.patch | 30 - recipes/qemu/qemu-0.9.1+svn/fix_brk.patch | 59 - .../qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch | 12 - .../qemu/qemu-0.9.1+svn/fix_protection_bits.patch | 14 - recipes/qemu/qemu-0.9.1+svn/fix_segfault.patch | 37 - recipes/qemu/qemu-0.9.1+svn/no-strip.patch | 26 - recipes/qemu/qemu-0.9.1+svn/qemu-0.9.0-nptl.patch | 1100 --------- .../qemu-amd64-32b-mapping-0.9.0.patch | 37 - .../qemu/qemu-0.9.1+svn/qemu-n800-support.patch | 2381 -------------------- .../qemu/qemu-0.9.1+svn/revert_arm_tcg.patch.gz | Bin 97991 -> 0 bytes recipes/qemu/qemu-0.9.1+svn/series | 25 - .../workaround_bad_futex_headers.patch | 25 - .../qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch | 23 - .../04_do_not_print_rtc_freq_if_ok.patch | 26 - .../05_non-fatal_if_linux_hd_missing.patch | 17 - recipes/qemu/qemu-0.9.1/06_exit_segfault.patch | 45 - recipes/qemu/qemu-0.9.1/10_signal_jobs.patch | 26 - recipes/qemu/qemu-0.9.1/11_signal_sigaction.patch | 21 - recipes/qemu/qemu-0.9.1/22_net_tuntap_stall.patch | 18 - recipes/qemu/qemu-0.9.1/31_syscalls.patch | 48 - recipes/qemu/qemu-0.9.1/32_syscall_sysctl.patch | 55 - recipes/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch | 22 - recipes/qemu/qemu-0.9.1/39_syscall_fadvise64.patch | 21 - recipes/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch | 104 - recipes/qemu/qemu-0.9.1/52_ne2000_return.patch | 17 - recipes/qemu/qemu-0.9.1/61_safe_64bit_int.patch | 27 - recipes/qemu/qemu-0.9.1/63_sparc_build.patch | 18 - .../qemu/qemu-0.9.1/64_ppc_asm_constraints.patch | 18 - recipes/qemu/qemu-0.9.1/65_kfreebsd.patch | 35 - recipes/qemu/qemu-0.9.1/66_tls_ld.patch | 55 - recipes/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch | 18 - .../qemu-0.9.1/configure_symlinkpath_fix.patch | 28 - .../qemu-0.9.1/disable-error-in-configure.patch | 17 - recipes/qemu/qemu-0.9.1/fix_segfault.patch | 37 - recipes/qemu/qemu-0.9.1/no-strip.patch | 22 - .../qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch | 219 -- recipes/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch | 929 -------- .../qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch | 37 - recipes/qemu/qemu-0.9.1/series | 25 - .../qemu-0.9.1/workaround_bad_futex_headers.patch | 25 - recipes/qemu/qemu-0.9.1/writev_fix.patch | 17 - recipes/qemu/qemu-gcc3-check.inc | 13 - recipes/qemu/qemu-native_0.9.1.bb | 5 - recipes/qemu/qemu-native_20070613.bb | 5 - recipes/qemu/qemu-native_cvs.bb | 5 - recipes/qemu/qemu-native_svn.bb | 5 - recipes/qemu/qemu_0.9.1.bb | 49 - recipes/qemu/qemu_20070613.bb | 48 - recipes/qemu/qemu_cvs.bb | 55 - recipes/qemu/qemu_svn.bb | 51 - 110 files changed, 1 insertion(+), 10777 deletions(-) delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/arm_nptl.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/compiler.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/configure.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/makefile.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/no-strip.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/pl110_rgb-r0.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl-update.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-amd64-32b-mapping-0.9.0.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-pci-irq-sharing.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-sdl-cursor.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-0.8.2.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-buttons.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-pressure.patch delete mode 100644 recipes/qemu/qemu-0.9.0+cvs20070613/workaround_bad_futex_headers.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/05_non-fatal_if_linux_hd_missing.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/06_exit_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/10_signal_jobs.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/11_signal_sigaction.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/31_syscalls.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/52_ne2000_return.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/63_sparc_build.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/64_ppc_asm_constraints.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/65_kfreebsd.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/66_tls_ld.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/configure_symlinkpath_fix.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/fix_brk.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/fix_protection_bits.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/fix_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/no-strip.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/qemu-0.9.0-nptl.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/qemu-n800-support.patch delete mode 100644 recipes/qemu/qemu-0.9.1+svn/revert_arm_tcg.patch.gz delete mode 100644 recipes/qemu/qemu-0.9.1+svn/series delete mode 100644 recipes/qemu/qemu-0.9.1+svn/workaround_bad_futex_headers.patch delete mode 100644 recipes/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch delete mode 100644 recipes/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch delete mode 100644 recipes/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch delete mode 100644 recipes/qemu/qemu-0.9.1/06_exit_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.1/10_signal_jobs.patch delete mode 100644 recipes/qemu/qemu-0.9.1/11_signal_sigaction.patch delete mode 100644 recipes/qemu/qemu-0.9.1/22_net_tuntap_stall.patch delete mode 100644 recipes/qemu/qemu-0.9.1/31_syscalls.patch delete mode 100644 recipes/qemu/qemu-0.9.1/32_syscall_sysctl.patch delete mode 100644 recipes/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch delete mode 100644 recipes/qemu/qemu-0.9.1/39_syscall_fadvise64.patch delete mode 100644 recipes/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch delete mode 100644 recipes/qemu/qemu-0.9.1/52_ne2000_return.patch delete mode 100644 recipes/qemu/qemu-0.9.1/61_safe_64bit_int.patch delete mode 100644 recipes/qemu/qemu-0.9.1/63_sparc_build.patch delete mode 100644 recipes/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch delete mode 100644 recipes/qemu/qemu-0.9.1/65_kfreebsd.patch delete mode 100644 recipes/qemu/qemu-0.9.1/66_tls_ld.patch delete mode 100644 recipes/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch delete mode 100644 recipes/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch delete mode 100644 recipes/qemu/qemu-0.9.1/disable-error-in-configure.patch delete mode 100644 recipes/qemu/qemu-0.9.1/fix_segfault.patch delete mode 100644 recipes/qemu/qemu-0.9.1/no-strip.patch delete mode 100644 recipes/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch delete mode 100644 recipes/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch delete mode 100644 recipes/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch delete mode 100644 recipes/qemu/qemu-0.9.1/series delete mode 100644 recipes/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch delete mode 100644 recipes/qemu/qemu-0.9.1/writev_fix.patch delete mode 100644 recipes/qemu/qemu-gcc3-check.inc delete mode 100644 recipes/qemu/qemu-native_0.9.1.bb delete mode 100644 recipes/qemu/qemu-native_20070613.bb delete mode 100644 recipes/qemu/qemu-native_cvs.bb delete mode 100644 recipes/qemu/qemu-native_svn.bb delete mode 100644 recipes/qemu/qemu_0.9.1.bb delete mode 100644 recipes/qemu/qemu_20070613.bb delete mode 100644 recipes/qemu/qemu_cvs.bb delete mode 100644 recipes/qemu/qemu_svn.bb diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 8e539db0b8..fb6045d21b 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -250,7 +250,7 @@ def icc_path(bb,d): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] + system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split() package_blacklist = system_package_blacklist + user_package_blacklist diff --git a/classes/qemu.bbclass b/classes/qemu.bbclass index 40a3542450..66dfb2b0d2 100644 --- a/classes/qemu.bbclass +++ b/classes/qemu.bbclass @@ -3,18 +3,6 @@ # existance. # -def check_gcc3(data): - # Used by qemu to make sure we have a workable gcc-3.x. - # Start by checking for the program name as we build it as there - # are some distribtuion provided gcc-3.x's that will not work. - gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' - - for gcc3 in gcc3_versions.split(): - if check_app_exists(gcc3, data): - return gcc3 - - return False - def qemu_target_binary(data): import bb diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 19310cbd9c..e8b6587500 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -87,15 +87,6 @@ def check_sanity(e): # If we'll be running qemu, perform some sanity checks if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True): - # Some versions of qemu-native needs gcc 3.x. Do a special - # check here to allow for host 'gcc' is 3.x. - if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: - gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") - - if not check_gcc3(e.data) and gcc_version[0] != '3': - messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH" - missing = missing + "gcc-3.x (needed for qemu-native)," - if "qemu-native" in assume_provided: required_utilities += " %s" % (qemu_target_binary(e.data)) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 643ae0b611..2cff53bc1b 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -35,12 +35,6 @@ BBMASK = "" # have to set PATH in your environment to make sure BitBake finds additional binaries. # ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" -# Uncomment this if you're building for an arch that uses emulated locale -# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler -# that OE recognises. This will mean the gcc-native build is skipped, speeding -# builds up. -# ASSUME_PROVIDED += "gcc3-native" - # Uncomment this if you are building Linux 2.4 Embedix kernels. # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget # to rename the binaries as instructed in the Wiki. diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch deleted file mode 100644 index bd955b6db3..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -#DPATCHLEVEL=0 ---- -# block.c | 6 +++++- -# 1 file changed, 5 insertions(+), 1 deletion(-) -# -Index: block.c -=================================================================== ---- block.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ block.c 2007-06-13 11:51:53.000000000 +0100 -@@ -188,8 +188,12 @@ void get_tmp_filename(char *filename, in - void get_tmp_filename(char *filename, int size) - { - int fd; -+ char *tmpdir; - /* XXX: race condition possible */ -- pstrcpy(filename, size, "/tmp/vl.XXXXXX"); -+ tmpdir = getenv("TMPDIR"); -+ if (!tmpdir) -+ tmpdir = "/tmp"; -+ snprintf(filename, size, "%s/vl.XXXXXX", tmpdir); - fd = mkstemp(filename); - close(fd); - } diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch deleted file mode 100644 index 73f31550fe..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=0 ---- -# vl.c | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: vl.c -=================================================================== ---- vl.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ vl.c 2007-06-13 11:52:24.000000000 +0100 -@@ -7242,7 +7242,7 @@ int main(int argc, char **argv) - m->name, m->desc, - m == first_machine ? " (default)" : ""); - } -- exit(1); -+ exit(strcmp(optarg, "?")); - } - break; - case QEMU_OPTION_cpu: diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch deleted file mode 100644 index 1575cbce63..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch +++ /dev/null @@ -1,25 +0,0 @@ -#DPATCHLEVEL=1 ---- -# vl.c | 6 +++++- -# 1 file changed, 5 insertions(+), 1 deletion(-) -# -Index: qemu/vl.c -=================================================================== ---- qemu.orig/vl.c 2007-06-13 11:51:53.000000000 +0100 -+++ qemu/vl.c 2007-06-13 11:52:19.000000000 +0100 -@@ -1026,10 +1026,14 @@ static int rtc_fd; - - static int start_rtc_timer(void) - { -+ unsigned long current_rtc_freq = 0; -+ - rtc_fd = open("/dev/rtc", O_RDONLY); - if (rtc_fd < 0) - return -1; -- if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { -+ ioctl(rtc_fd, RTC_IRQP_READ, ¤t_rtc_freq); -+ if (current_rtc_freq != RTC_FREQ && -+ ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { - fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n" - "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n" - "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n"); diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch deleted file mode 100644 index b7c4732f24..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch +++ /dev/null @@ -1,17 +0,0 @@ -#DPATCHLEVEL=1 ---- -# hw/pc.c | 1 - -# 1 file changed, 1 deletion(-) -# -Index: qemu/hw/pc.c -=================================================================== ---- qemu.orig/hw/pc.c 2007-06-13 11:51:52.000000000 +0100 -+++ qemu/hw/pc.c 2007-06-13 11:51:53.000000000 +0100 -@@ -355,7 +355,6 @@ static void generate_bootsect(uint32_t g - if (bs_table[0] == NULL) { - fprintf(stderr, "A disk image must be given for 'hda' when booting " - "a Linux kernel\n"); -- exit(1); - } - - memset(bootsect, 0, sizeof(bootsect)); diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch deleted file mode 100644 index 447c3550b8..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch +++ /dev/null @@ -1,45 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/main.c | 8 ++++---- -# 1 file changed, 4 insertions(+), 4 deletions(-) -# -Index: linux-user/main.c -=================================================================== ---- linux-user/main.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ linux-user/main.c 2007-06-13 11:52:16.000000000 +0100 -@@ -642,7 +642,7 @@ void cpu_loop (CPUSPARCState *env) - default: - printf ("Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(env, stderr, fprintf, 0); -- exit (1); -+ _exit (1); - } - process_pending_signals (env); - } -@@ -1471,7 +1471,7 @@ void cpu_loop (CPUState *env) - default: - printf ("Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(env, stderr, fprintf, 0); -- exit (1); -+ _exit (1); - } - process_pending_signals (env); - } -@@ -1735,7 +1735,7 @@ int main(int argc, char **argv) - for(item = cpu_log_items; item->mask != 0; item++) { - printf("%-10s %s\n", item->name, item->help); - } -- exit(1); -+ _exit(1); - } - cpu_set_log(mask); - } else if (!strcmp(r, "s")) { -@@ -1754,7 +1754,7 @@ int main(int argc, char **argv) - if (qemu_host_page_size == 0 || - (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) { - fprintf(stderr, "page size must be a power of two\n"); -- exit(1); -+ _exit(1); - } - } else if (!strcmp(r, "g")) { - gdbstub_port = atoi(argv[optind++]); diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch deleted file mode 100644 index 794a538676..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch +++ /dev/null @@ -1,26 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/signal.c | 7 ++++++- -# 1 file changed, 6 insertions(+), 1 deletion(-) -# -Index: linux-user/signal.c -=================================================================== ---- linux-user/signal.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ linux-user/signal.c 2007-06-13 11:52:21.000000000 +0100 -@@ -341,10 +341,15 @@ int queue_signal(int sig, target_siginfo - k = &sigact_table[sig - 1]; - handler = k->sa._sa_handler; - if (handler == TARGET_SIG_DFL) { -+ if (sig == TARGET_SIGTSTP || sig == TARGET_SIGTTIN || sig == TARGET_SIGTTOU) { -+ kill(getpid(),SIGSTOP); -+ return 0; -+ } else - /* default handler : ignore some signal. The other are fatal */ - if (sig != TARGET_SIGCHLD && - sig != TARGET_SIGURG && -- sig != TARGET_SIGWINCH) { -+ sig != TARGET_SIGWINCH && -+ sig != TARGET_SIGCONT) { - force_sig(sig); - } else { - return 0; /* indicate ignored */ diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch deleted file mode 100644 index 5446efc562..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch +++ /dev/null @@ -1,21 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/signal.c | 5 +++++ -# 1 file changed, 5 insertions(+) -# -Index: linux-user/signal.c -=================================================================== ---- linux-user/signal.c.orig 2007-06-13 11:51:54.000000000 +0100 -+++ linux-user/signal.c 2007-06-13 11:52:20.000000000 +0100 -@@ -429,6 +429,11 @@ int do_sigaction(int sig, const struct t - - if (sig < 1 || sig > TARGET_NSIG || sig == SIGKILL || sig == SIGSTOP) - return -EINVAL; -+ -+ /* no point doing the stuff as those are not allowed for sigaction */ -+ if ((sig == TARGET_SIGKILL) || (sig == TARGET_SIGSTOP)) -+ return -EINVAL; -+ - k = &sigact_table[sig - 1]; - #if defined(DEBUG_SIGNAL) - fprintf(stderr, "sigaction sig=%d act=0x%08x, oact=0x%08x\n", diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch deleted file mode 100644 index d8d4198784..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch +++ /dev/null @@ -1,401 +0,0 @@ -#DPATCHLEVEL=1 ---- -# linux-user/signal.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++++ -# 1 file changed, 371 insertions(+) -# -Index: qemu/linux-user/signal.c -=================================================================== ---- qemu.orig/linux-user/signal.c 2007-06-13 11:51:54.000000000 +0100 -+++ qemu/linux-user/signal.c 2007-06-13 11:51:54.000000000 +0100 -@@ -2,6 +2,7 @@ - * Emulation of Linux signals - * - * Copyright (c) 2003 Fabrice Bellard -+ * Copyright (c) 2005 Josh Triplett - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -16,6 +17,12 @@ - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * Various portions adapted from the Linux kernel: -+ * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) -+ * Derived from "arch/i386/kernel/signal.c" -+ * Copyright (C) 1991, 1992 Linus Torvalds -+ * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson - */ - #include - #include -@@ -1964,6 +1971,370 @@ long do_rt_sigreturn(CPUState *env) - return -ENOSYS; - } - -+#elif defined(TARGET_PPC) -+/* Adapted from the Linux kernel: -+ * arch/ppc/kernel/signal.c -+ * include/asm-ppc/elf.h -+ * include/asm-ppc/ptrace.h -+ * include/asm-ppc/sigcontext.h -+ * include/asm-ppc/ucontext.h -+ */ -+ -+/* -+ * When we have signals to deliver, we set up on the -+ * user stack, going down from the original stack pointer: -+ * a sigregs struct -+ * a sigcontext struct -+ * a gap of __SIGNAL_FRAMESIZE bytes -+ * -+ * Each of these things must be a multiple of 16 bytes in size. -+ * -+ */ -+ -+#define TARGET_ELF_NGREG 48 /* includes nip, msr, lr, etc. */ -+#define TARGET_ELF_NFPREG 33 /* includes fpscr */ -+#define TARGET_ELF_NVRREG 33 /* includes vscr */ -+ -+/* General registers */ -+typedef unsigned long target_elf_greg_t; -+typedef target_elf_greg_t target_elf_gregset_t[TARGET_ELF_NGREG]; -+ -+/* Floating point registers */ -+typedef double target_elf_fpreg_t; -+typedef target_elf_fpreg_t target_elf_fpregset_t[TARGET_ELF_NFPREG]; -+ -+/* Altivec registers */ -+/* FIXME: Altivec not supported yet. */ -+/* typedef __vector128 elf_vrreg_t; */ -+typedef uint64_t target_elf_vrreg_t[2]; -+typedef target_elf_vrreg_t target_elf_vrregset_t[TARGET_ELF_NVRREG]; -+ -+struct target_mcontext { -+ target_elf_gregset_t mc_gregs; -+ target_elf_fpregset_t mc_fregs; -+ /* The kernel calls this mc_pad, but does #define tramp mc_pad */ -+ target_ulong tramp[2]; -+ target_elf_vrregset_t mc_vregs __attribute__((__aligned__(16))); -+}; -+ -+struct target_sigregs { -+ struct target_mcontext mctx; /* all the register values */ -+ /* Programs using the rs6000/xcoff abi can save up to 19 gp regs -+ and 18 fp regs below sp before decrementing it. */ -+ int abigap[56]; -+}; -+ -+struct target_sigcontext { -+ target_ulong _unused[4]; -+ uint32_t signal; -+ target_ulong handler; -+ target_ulong oldmask; -+ struct target_pt_regs *regs; -+}; -+ -+#define __SIGNAL_FRAMESIZE 64 -+ -+static int -+save_user_regs(CPUState *env, struct target_mcontext *frame, int sigret) -+{ -+ /* save general and floating-point registers */ -+#if 0 /* FIXME: handle floating-point, Altivec, SPE */ -+ CHECK_FULL_REGS(regs); -+ preempt_disable(); -+ if (regs->msr & MSR_FP) -+ giveup_fpu(current); -+#ifdef CONFIG_ALTIVEC -+ if (current->thread.used_vr && (regs->msr & MSR_VEC)) -+ giveup_altivec(current); -+#endif /* CONFIG_ALTIVEC */ -+#ifdef CONFIG_SPE -+ if (current->thread.used_spe && (regs->msr & MSR_SPE)) -+ giveup_spe(current); -+#endif /* CONFIG_ALTIVEC */ -+ preempt_enable(); -+#endif /* 0 */ -+ -+ /* Note: this needs to be in the same order as target_pt_regs */ -+ if(!memcpy(&frame->mc_gregs, env->gpr, -+ 32*sizeof(target_elf_greg_t)) -+ || __put_user(env->nip, &frame->mc_gregs[32]) -+ || __put_user(do_load_msr(env), &frame->mc_gregs[33]) -+ /* FIXME: || __put_user(orig_gpr3, &frame->mc_gregs[34]) */ -+ || __put_user(env->ctr, &frame->mc_gregs[35]) -+ || __put_user(env->lr, &frame->mc_gregs[36]) -+ || __put_user(do_load_xer(env), &frame->mc_gregs[37]) -+ || __put_user(do_load_cr(env), &frame->mc_gregs[38]) -+ || __put_user(env->spr[SPR_MQ], &frame->mc_gregs[39]) -+ /* FIXME: || __put_user(trap, &frame->mc_gregs[40]) */ -+ || __put_user(env->spr[SPR_DAR], &frame->mc_gregs[41]) -+ || __put_user(env->spr[SPR_DSISR], &frame->mc_gregs[42]) -+ /* FIXME: || __put_user(result, &frame->mc_gregs[43]) */) -+ return 1; -+ -+ if(!memcpy(&frame->mc_fregs, env->fpr, -+ 32*sizeof(target_elf_fpreg_t)) -+ || __put_user(do_load_fpscr(env), &frame->mc_fregs[32])) -+ -+ do_store_fpscr(env, 0, 0xFF); /* turn off all fp exceptions */ -+ -+#if 0 /* FIXME: handle Altivec, SPE */ -+#ifdef CONFIG_ALTIVEC -+ /* save altivec registers */ -+ if (current->thread.used_vr) { -+ if (!memcpy(&frame->mc_vregs, current->thread.vr, -+ ELF_NVRREG * sizeof(vector128))) -+ return 1; -+ /* set MSR_VEC in the saved MSR value to indicate that -+ frame->mc_vregs contains valid data */ -+ if (__put_user(regs->msr | MSR_VEC, &frame->mc_gregs[PT_MSR])) -+ return 1; -+ } -+ /* else assert((regs->msr & MSR_VEC) == 0) */ -+ -+ /* We always copy to/from vrsave, it's 0 if we don't have or don't -+ * use altivec. Since VSCR only contains 32 bits saved in the least -+ * significant bits of a vector, we "cheat" and stuff VRSAVE in the -+ * most significant bits of that same vector. --BenH -+ */ -+ if (__put_user(current->thread.vrsave, (u32 __user *)&frame->mc_vregs[32])) -+ return 1; -+#endif /* CONFIG_ALTIVEC */ -+ -+#ifdef CONFIG_SPE -+ /* save spe registers */ -+ if (current->thread.used_spe) { -+ if (!memcpy(&frame->mc_vregs, current->thread.evr, -+ ELF_NEVRREG * sizeof(u32))) -+ return 1; -+ /* set MSR_SPE in the saved MSR value to indicate that -+ frame->mc_vregs contains valid data */ -+ if (__put_user(regs->msr | MSR_SPE, &frame->mc_gregs[PT_MSR])) -+ return 1; -+ } -+ /* else assert((regs->msr & MSR_SPE) == 0) */ -+ -+ /* We always copy to/from spefscr */ -+ if (__put_user(current->thread.spefscr, (u32 *)&frame->mc_vregs + ELF_NEVRREG)) -+ return 1; -+#endif /* CONFIG_SPE */ -+#endif /* 0 */ -+ -+ if (sigret) { -+ /* Set up the sigreturn trampoline: li r0,sigret; sc */ -+ if (__put_user(0x38000000UL + sigret, &frame->tramp[0]) -+ || __put_user(0x44000002UL, &frame->tramp[1])) -+ return 1; -+#if 0 -+ flush_icache_range((unsigned long) &frame->tramp[0], -+ (unsigned long) &frame->tramp[2]); -+#endif -+ } -+ -+ return 0; -+} -+ -+static int -+restore_user_regs(CPUState *env, struct target_mcontext *sr, int sig) -+{ -+ target_ulong save_r2 = 0; -+ target_ulong saved_xer; -+ target_ulong saved_cr; -+ double saved_fpscr; -+ -+#if 0 /* FIXME: handle Altivec, SPE */ -+#if defined(CONFIG_ALTIVEC) || defined(CONFIG_SPE) -+ unsigned long msr; -+#endif -+#endif /* 0 */ -+ -+ /* backup/restore the TLS as we don't want it to be modified */ -+ if (!sig) -+ save_r2 = env->gpr[2]; -+ -+ /* Copy all registers except MSR */ -+ /* Note: this needs to be in the same order as target_pt_regs */ -+ if(!memcpy(env->gpr, &sr->mc_gregs, -+ 32*sizeof(target_elf_greg_t)) -+ || __get_user(env->nip, &sr->mc_gregs[32]) -+ /* FIXME: || __get_user(orig_gpr3, &sr->mc_gregs[34]) */ -+ || __get_user(env->ctr, &sr->mc_gregs[35]) -+ || __get_user(env->lr, &sr->mc_gregs[36]) -+ || __get_user(saved_xer, &sr->mc_gregs[37]) -+ || __get_user(saved_cr, &sr->mc_gregs[38]) -+ || __get_user(env->spr[SPR_MQ], &sr->mc_gregs[39]) -+ /* FIXME: || __get_user(trap, &sr->mc_gregs[40]) */ -+ || __get_user(env->spr[SPR_DAR], &sr->mc_gregs[41]) -+ || __get_user(env->spr[SPR_DSISR], &sr->mc_gregs[42]) -+ /* FIXME: || __get_user(result, &sr->mc_gregs[43]) */) -+ return 1; -+ do_store_xer(env, saved_xer); -+ do_store_cr(env, saved_cr, 0xFF); -+ -+ if (!sig) -+ env->gpr[2] = save_r2; -+ -+ /* The kernel delays restoring the floating-point registers until the -+ * thread uses floating-point again. For simplicity, just restore the -+ * registers now. */ -+ if(!memcpy(env->fpr, &sr->mc_fregs, -+ 32*sizeof(target_elf_fpreg_t)) -+ || __get_user(saved_fpscr, &sr->mc_fregs[32])) -+ return 1; -+ do_store_fpscr(env, saved_fpscr, 0xFF); -+ -+#if 0 /* FIXME: handle Altivec, SPE */ -+#ifdef CONFIG_ALTIVEC -+ /* force the process to reload the altivec registers from -+ current->thread when it next does altivec instructions */ -+ regs->msr &= ~MSR_VEC; -+ if (!__get_user(msr, &sr->mc_gregs[PT_MSR]) && (msr & MSR_VEC) != 0) { -+ /* restore altivec registers from the stack */ -+ if (!memcpy(current->thread.vr, &sr->mc_vregs, -+ sizeof(sr->mc_vregs))) -+ return 1; -+ } else if (current->thread.used_vr) -+ memset(¤t->thread.vr, 0, ELF_NVRREG * sizeof(vector128)); -+ -+ /* Always get VRSAVE back */ -+ if (__get_user(current->thread.vrsave, (u32 __user *)&sr->mc_vregs[32])) -+ return 1; -+#endif /* CONFIG_ALTIVEC */ -+ -+#ifdef CONFIG_SPE -+ /* force the process to reload the spe registers from -+ current->thread when it next does spe instructions */ -+ regs->msr &= ~MSR_SPE; -+ if (!__get_user(msr, &sr->mc_gregs[PT_MSR]) && (msr & MSR_SPE) != 0) { -+ /* restore spe registers from the stack */ -+ if (!memcpy(current->thread.evr, &sr->mc_vregs, -+ ELF_NEVRREG * sizeof(u32))) -+ return 1; -+ } else if (current->thread.used_spe) -+ memset(¤t->thread.evr, 0, ELF_NEVRREG * sizeof(u32)); -+ -+ /* Always get SPEFSCR back */ -+ if (__get_user(current->thread.spefscr, (u32 *)&sr->mc_vregs + ELF_NEVRREG)) -+ return 1; -+#endif /* CONFIG_SPE */ -+#endif /* 0 */ -+ -+#if 0 /* FIXME: handle floating-point, Altivec, SPE */ -+#ifndef CONFIG_SMP -+ preempt_disable(); -+ if (last_task_used_math == current) -+ last_task_used_math = NULL; -+ if (last_task_used_altivec == current) -+ last_task_used_altivec = NULL; -+ if (last_task_used_spe == current) -+ last_task_used_spe = NULL; -+ preempt_enable(); -+#endif -+#endif /* 0 */ -+ return 0; -+} -+ -+static void setup_frame(int sig, struct emulated_sigaction *ka, -+ target_sigset_t *oldset, CPUState *env) -+{ -+ struct target_sigcontext *sc; -+ struct target_sigregs *frame; -+ target_ulong origsp = env->gpr[1]; -+ target_ulong newsp = origsp; -+ -+ /* Set up Signal Frame */ -+ newsp -= sizeof(struct target_sigregs); -+ frame = (struct target_sigregs *) newsp; -+ -+ /* Put a sigcontext on the stack */ -+ newsp -= sizeof(*sc); -+ sc = (struct target_sigcontext *) newsp; -+ -+ /* create a stack frame for the caller of the handler */ -+ newsp -= __SIGNAL_FRAMESIZE; -+ -+ if (!access_ok(VERIFY_WRITE, (void *) newsp, origsp - newsp)) -+ goto badframe; -+ -+#if TARGET_NSIG != 64 -+#error "Please adjust handle_signal()" -+#endif -+ if (__put_user((target_ulong) ka->sa._sa_handler, &sc->handler) -+ || __put_user(oldset->sig[0], &sc->oldmask) -+ || __put_user(oldset->sig[1], &sc->_unused[3]) -+ || __put_user(frame, (target_ulong *)&sc->regs) -+ || __put_user(sig, &sc->signal)) -+ goto badframe; -+ -+ if (save_user_regs(env, &frame->mctx, TARGET_NR_sigreturn)) -+ goto badframe; -+ -+ if (put_user(env->gpr[1], (unsigned long *)newsp)) -+ goto badframe; -+ env->gpr[1] = newsp; -+ env->gpr[3] = sig; -+ env->gpr[4] = (unsigned long) sc; -+ env->nip = (unsigned long) ka->sa._sa_handler; -+ env->lr = (unsigned long) frame->mctx.tramp; -+ /* FIXME: env->trap = 0; */ -+ -+ return; -+ -+badframe: -+#ifdef DEBUG_SIGNAL -+ fprintf(stderr, -+ "badframe in handle_signal, frame=%p newsp=%lx\n", -+ frame, newsp); -+#endif -+ force_sig(TARGET_SIGSEGV); -+} -+ -+static void setup_rt_frame(int sig, struct emulated_sigaction *ka, -+ target_siginfo_t *info, -+ target_sigset_t *set, CPUState *env) -+{ -+ fprintf(stderr, "setup_rt_frame: not implemented\n"); -+} -+ -+long do_sigreturn(CPUState *env) -+{ -+ struct target_sigcontext *sc; -+ struct target_sigcontext sigctx; -+ struct target_mcontext *sr; -+ target_sigset_t set; -+ sigset_t host_set; -+ -+ /* Always make any pending restarted system calls return -EINTR */ -+#if 0 /* FIXME */ -+ current_thread_info()->restart_block.fn = do_no_restart_syscall; -+#endif -+ -+ sc = (struct target_sigcontext *)(env->gpr[1] + __SIGNAL_FRAMESIZE); -+ if (!memcpy(&sigctx, sc, sizeof(sigctx))) -+ goto badframe; -+ -+ set.sig[0] = sigctx.oldmask; -+ set.sig[1] = sigctx._unused[3]; -+ target_to_host_sigset_internal(&host_set, &set); -+ sigprocmask(SIG_SETMASK, &host_set, NULL); -+ -+ sr = (struct target_mcontext *) tswapl((target_ulong)sigctx.regs); -+ if (!access_ok(VERIFY_READ, sr, sizeof(*sr)) -+ || restore_user_regs(env, sr, 1)) -+ goto badframe; -+ -+ return 0; -+ -+badframe: -+ force_sig(TARGET_SIGSEGV); -+ return 0; -+} -+ -+long do_rt_sigreturn(CPUState *env) -+{ -+ fprintf(stderr, "do_rt_sigreturn: not implemented\n"); -+ return -ENOSYS; -+} -+ - #else - - static void setup_frame(int sig, struct emulated_sigaction *ka, diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch deleted file mode 100644 index e9b31dfe40..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=0 ---- -# vl.c | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: vl.c -=================================================================== ---- vl.c.orig 2007-06-13 11:51:53.000000000 +0100 -+++ vl.c 2007-06-13 11:52:10.000000000 +0100 -@@ -3617,7 +3617,7 @@ static int tap_open(char *ifname, int if - return -1; - } - memset(&ifr, 0, sizeof(ifr)); -- ifr.ifr_flags = IFF_TAP | IFF_NO_PI; -+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; - if (ifname[0] != '\0') - pstrcpy(ifr.ifr_name, IFNAMSIZ, ifname); - else diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch deleted file mode 100644 index 3dc58102ad..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch +++ /dev/null @@ -1,34 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/syscall.c | 7 +++++-- -# 1 file changed, 5 insertions(+), 2 deletions(-) -# -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2007-04-18 13:25:40.000000000 +0100 -+++ linux-user/syscall.c 2007-04-18 13:37:27.000000000 +0100 -@@ -43,7 +43,10 @@ - #include - #include - #include -+#include - #include -+#include -+#include - #include - #include - #include -@@ -1240,11 +1243,11 @@ static long do_ipc(long call, long first - ret = get_errno(shmctl(first, second, NULL)); - break; - default: -- goto unimplemented; -+ ret = get_errno(shmctl(first, second, (struct shmid_ds *) ptr)); -+ break; - } - break; - default: -- unimplemented: - gemu_log("Unsupported ipc call: %ld (version %d)\n", call, version); - ret = -ENOSYS; - break; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch deleted file mode 100644 index 3878079f19..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch +++ /dev/null @@ -1,49 +0,0 @@ -#DPATCHLEVEL=0 ---- -# Makefile.target | 2 +- -# linux-user/syscall.c | 11 ++++++++--- -# 2 files changed, 9 insertions(+), 4 deletions(-) -# -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ linux-user/syscall.c 2007-06-13 11:52:18.000000000 +0100 -@@ -180,6 +180,7 @@ extern int getresuid(uid_t *, uid_t *, u - extern int setresgid(gid_t, gid_t, gid_t); - extern int getresgid(gid_t *, gid_t *, gid_t *); - extern int setgroups(int, gid_t *); -+extern int uselib(const char*); - - /* - * This list is the union of errno values overidden in asm-/errno.h -@@ -3215,7 +3216,8 @@ long do_syscall(void *cpu_env, int num, - break; - #ifdef TARGET_NR_uselib - case TARGET_NR_uselib: -- goto unimplemented; -+ ret = get_errno(uselib(path((const char*)arg1))); -+ break; - #endif - #ifdef TARGET_NR_swapon - case TARGET_NR_swapon: -@@ -4405,7 +4407,9 @@ long do_syscall(void *cpu_env, int num, - goto unimplemented; - #ifdef TARGET_NR_mincore - case TARGET_NR_mincore: -- goto unimplemented; -+ page_unprotect_range((void*)arg3, ((size_t)arg2 + TARGET_PAGE_SIZE - 1) / TARGET_PAGE_SIZE); -+ ret = get_errno(mincore((void*)arg1, (size_t)arg2, (unsigned char*)arg3)); -+ break; - #endif - #ifdef TARGET_NR_madvise - case TARGET_NR_madvise: -@@ -4539,7 +4543,8 @@ long do_syscall(void *cpu_env, int num, - break; - #ifdef TARGET_NR_readahead - case TARGET_NR_readahead: -- goto unimplemented; -+ ret = get_errno(readahead((int)arg1, (off64_t)arg2, (size_t)arg3)); -+ break; - #endif - #ifdef TARGET_NR_setxattr - case TARGET_NR_setxattr: diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch deleted file mode 100644 index d175cf96ba..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch +++ /dev/null @@ -1,56 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/syscall.c | 33 ++++++++++++++++++++++++++++++--- -# 1 file changed, 30 insertions(+), 3 deletions(-) -# -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2007-06-13 11:51:54.000000000 +0100 -+++ linux-user/syscall.c 2007-06-13 11:52:17.000000000 +0100 -@@ -52,6 +52,7 @@ - //#include - #include - #include -+#include - - #define termios host_termios - #define winsize host_winsize -@@ -3912,9 +3913,35 @@ long do_syscall(void *cpu_env, int num, - break; - #endif - case TARGET_NR__sysctl: -- /* We don't implement this, but ENODIR is always a safe -- return value. */ -- return -ENOTDIR; -+ { -+ struct __sysctl_args *args = (struct __sysctl_args *) arg1; -+ int *name_target, *name, nlen, *oldlenp, oldlen, newlen, i; -+ void *oldval, *newval; -+ -+ name_target = (int *) tswapl((long) args->name); -+ nlen = tswapl(args->nlen); -+ oldval = (void *) tswapl((long) args->oldval); -+ oldlenp = (int *) tswapl((long) args->oldlenp); -+ oldlen = tswapl(*oldlenp); -+ newval = (void *) tswapl((long) args->newval); -+ newlen = tswapl(args->newlen); -+ -+ name = alloca(nlen * sizeof (int)); -+ for (i = 0; i < nlen; i++) -+ name[i] = tswapl(name_target[i]); -+ -+ if (nlen == 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) { -+ ret = get_errno( -+ sysctl(name, nlen, oldval, &oldlen, newval, newlen)); -+ if (!is_error(ret)) { -+ *oldlenp = tswapl(oldlen); -+ } -+ } else { -+ gemu_log("qemu: Unsupported sysctl name\n"); -+ ret = -ENOSYS; -+ } -+ } -+ break; - case TARGET_NR_sched_setparam: - { - struct sched_param *target_schp; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch deleted file mode 100644 index a71f8b1944..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch +++ /dev/null @@ -1,22 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/syscall.c | 6 +----- -# 1 file changed, 1 insertion(+), 5 deletions(-) -# -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2007-06-13 11:51:54.000000000 +0100 -+++ linux-user/syscall.c 2007-06-13 11:52:17.000000000 +0100 -@@ -2177,11 +2177,7 @@ int do_fork(CPUState *env, unsigned int - if (!newsp) - newsp = env->gpr[1]; - new_env->gpr[1] = newsp; -- { -- int i; -- for (i = 7; i < 32; i++) -- new_env->gpr[i] = 0; -- } -+ new_env->gpr[3] = 0; - #elif defined(TARGET_SH4) - if (!newsp) - newsp = env->gregs[15]; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch deleted file mode 100644 index 0a7f4c48dd..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - linux-user/syscall.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: linux-user/syscall.c -=================================================================== ---- linux-user/syscall.c.orig 2007-06-13 11:51:55.000000000 +0100 -+++ linux-user/syscall.c 2007-06-13 11:52:13.000000000 +0100 -@@ -4434,6 +4434,12 @@ long do_syscall(void *cpu_env, int num, - ret = get_errno(mincore((void*)arg1, (size_t)arg2, (unsigned char*)arg3)); - break; - #endif -+#ifdef TARGET_NR_fadvise64_64 -+ case TARGET_NR_fadvise64_64: -+ /* Just return success */ -+ ret = get_errno(0); -+ break; -+#endif - #ifdef TARGET_NR_madvise - case TARGET_NR_madvise: - /* A straight passthrough may not be safe because qemu sometimes diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch deleted file mode 100644 index d579dbc66e..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch +++ /dev/null @@ -1,105 +0,0 @@ -#DPATCHLEVEL=0 ---- -# linux-user/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-- -# target-arm/nwfpe/fpa11.c | 7 ++++++ -# 2 files changed, 58 insertions(+), 2 deletions(-) -# -Index: linux-user/main.c -=================================================================== ---- linux-user/main.c.orig 2007-06-13 11:51:53.000000000 +0100 -+++ linux-user/main.c 2007-06-13 11:52:07.000000000 +0100 -@@ -339,18 +339,67 @@ void cpu_loop(CPUARMState *env) - { - TaskState *ts = env->opaque; - uint32_t opcode; -+ int rc; - - /* we handle the FPU emulation here, as Linux */ - /* we get the opcode */ - opcode = tget32(env->regs[15]); - -- if (EmulateAll(opcode, &ts->fpa, env) == 0) { -+ rc = EmulateAll(opcode, &ts->fpa, env); -+ if (rc == 0) { /* illegal instruction */ - info.si_signo = SIGILL; - info.si_errno = 0; - info.si_code = TARGET_ILL_ILLOPN; - info._sifields._sigfault._addr = env->regs[15]; - queue_signal(info.si_signo, &info); -- } else { -+ } else if (rc < 0) { /* FP exception */ -+ int arm_fpe=0; -+ -+ /* translate softfloat flags to FPSR flags */ -+ if (-rc & float_flag_invalid) -+ arm_fpe |= BIT_IOC; -+ if (-rc & float_flag_divbyzero) -+ arm_fpe |= BIT_DZC; -+ if (-rc & float_flag_overflow) -+ arm_fpe |= BIT_OFC; -+ if (-rc & float_flag_underflow) -+ arm_fpe |= BIT_UFC; -+ if (-rc & float_flag_inexact) -+ arm_fpe |= BIT_IXC; -+ -+ FPSR fpsr = ts->fpa.fpsr; -+ //printf("fpsr 0x%x, arm_fpe 0x%x\n",fpsr,arm_fpe); -+ -+ if (fpsr & (arm_fpe << 16)) { /* exception enabled? */ -+ info.si_signo = SIGFPE; -+ info.si_errno = 0; -+ -+ /* ordered by priority, least first */ -+ if (arm_fpe & BIT_IXC) info.si_code = TARGET_FPE_FLTRES; -+ if (arm_fpe & BIT_UFC) info.si_code = TARGET_FPE_FLTUND; -+ if (arm_fpe & BIT_OFC) info.si_code = TARGET_FPE_FLTOVF; -+ if (arm_fpe & BIT_DZC) info.si_code = TARGET_FPE_FLTDIV; -+ if (arm_fpe & BIT_IOC) info.si_code = TARGET_FPE_FLTINV; -+ -+ info._sifields._sigfault._addr = env->regs[15]; -+ queue_signal(info.si_signo, &info); -+ } else { -+ env->regs[15] += 4; -+ } -+ -+ /* accumulate unenabled exceptions */ -+ if ((!(fpsr & BIT_IXE)) && (arm_fpe & BIT_IXC)) -+ fpsr |= BIT_IXC; -+ if ((!(fpsr & BIT_UFE)) && (arm_fpe & BIT_UFC)) -+ fpsr |= BIT_UFC; -+ if ((!(fpsr & BIT_OFE)) && (arm_fpe & BIT_OFC)) -+ fpsr |= BIT_OFC; -+ if ((!(fpsr & BIT_DZE)) && (arm_fpe & BIT_DZC)) -+ fpsr |= BIT_DZC; -+ if ((!(fpsr & BIT_IOE)) && (arm_fpe & BIT_IOC)) -+ fpsr |= BIT_IOC; -+ ts->fpa.fpsr=fpsr; -+ } else { /* everything OK */ - /* increment PC */ - env->regs[15] += 4; - } -Index: target-arm/nwfpe/fpa11.c -=================================================================== ---- target-arm/nwfpe/fpa11.c.orig 2007-06-13 11:51:52.000000000 +0100 -+++ target-arm/nwfpe/fpa11.c 2007-06-13 11:51:55.000000000 +0100 -@@ -162,6 +162,8 @@ unsigned int EmulateAll(unsigned int opc - fpa11->initflag = 1; - } - -+ set_float_exception_flags(0, &fpa11->fp_status); -+ - if (TEST_OPCODE(opcode,MASK_CPRT)) - { - //fprintf(stderr,"emulating CPRT\n"); -@@ -191,6 +193,11 @@ unsigned int EmulateAll(unsigned int opc - } - - // restore_flags(flags); -+ if(nRc == 1 && get_float_exception_flags(&fpa11->fp_status)) -+ { -+ //printf("fef 0x%x\n",float_exception_flags); -+ nRc=-get_float_exception_flags(&fpa11->fp_status); -+ } - - //printf("returning %d\n",nRc); - return(nRc); diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch deleted file mode 100644 index f0316c8042..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - hw/ne2000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: qemu/hw/ne2000.c -=================================================================== ---- qemu.orig/hw/ne2000.c 2007-06-13 11:51:52.000000000 +0100 -+++ qemu/hw/ne2000.c 2007-06-13 11:51:55.000000000 +0100 -@@ -214,7 +214,7 @@ static int ne2000_can_receive(void *opaq - NE2000State *s = opaque; - - if (s->cmd & E8390_STOP) -- return 1; -+ return 0; - return !ne2000_buffer_full(s); - } - diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch deleted file mode 100644 index 553e57623e..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch +++ /dev/null @@ -1,27 +0,0 @@ -#DPATCHLEVEL=0 ---- -# dyngen-exec.h | 4 ++-- -# 1 file changed, 2 insertions(+), 2 deletions(-) -# -Index: dyngen-exec.h -=================================================================== ---- dyngen-exec.h.orig 2007-06-13 11:48:22.000000000 +0100 -+++ dyngen-exec.h 2007-06-13 11:51:55.000000000 +0100 -@@ -38,7 +38,7 @@ typedef unsigned int uint32_t; - // Linux/Sparc64 defines uint64_t - #if !(defined (__sparc_v9__) && defined(__linux__)) - /* XXX may be done for all 64 bits targets ? */ --#if defined (__x86_64__) || defined(__ia64) -+#if defined (__x86_64__) || defined(__ia64) || defined(__alpha__) || defined(__sparc__) - typedef unsigned long uint64_t; - #else - typedef unsigned long long uint64_t; -@@ -55,7 +55,7 @@ typedef signed short int16_t; - typedef signed int int32_t; - // Linux/Sparc64 defines int64_t - #if !(defined (__sparc_v9__) && defined(__linux__)) --#if defined (__x86_64__) || defined(__ia64) -+#if defined (__x86_64__) || defined(__ia64) || defined(__alpha__) || defined(__sparc__) - typedef signed long int64_t; - #else - typedef signed long long int64_t; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch deleted file mode 100644 index 32a6bc0ee0..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=0 ---- -# sparc.ld | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: sparc.ld -=================================================================== ---- sparc.ld.orig 2007-06-13 11:48:22.000000000 +0100 -+++ sparc.ld 2007-06-13 11:51:56.000000000 +0100 -@@ -6,7 +6,7 @@ ENTRY(_start) - SECTIONS - { - /* Read-only sections, merged into text segment: */ -- . = 0x60000000 + SIZEOF_HEADERS; -+ . = 0x60000000 + 0x400; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch deleted file mode 100644 index e4858b79d7..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch +++ /dev/null @@ -1,18 +0,0 @@ -#DPATCHLEVEL=1 ---- -# cpu-all.h | 2 +- -# 1 file changed, 1 insertion(+), 1 deletion(-) -# -Index: qemu/cpu-all.h -=================================================================== ---- qemu.orig/cpu-all.h 2007-06-13 11:48:22.000000000 +0100 -+++ qemu/cpu-all.h 2007-06-13 11:51:56.000000000 +0100 -@@ -250,7 +250,7 @@ static inline void stw_le_p(void *ptr, i - static inline void stl_le_p(void *ptr, int v) - { - #ifdef __powerpc__ -- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); -+ __asm__ __volatile__ ("stwbrx %0,0,%1" : : "r" (v), "r" (ptr) : "memory"); - #else - uint8_t *p = ptr; - p[0] = v; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch deleted file mode 100644 index ea060811a1..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- - configure | 6 ++++++ - vl.c | 4 +++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: configure -=================================================================== ---- configure.orig 2007-06-13 11:48:22.000000000 +0100 -+++ configure 2007-06-13 11:52:07.000000000 +0100 -@@ -112,6 +112,12 @@ OS_CFLAGS="-mno-cygwin" - MINGW32*) - mingw32="yes" - ;; -+GNU/kFreeBSD) -+oss="yes" -+if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then -+ kqemu="yes" -+fi -+;; - FreeBSD) - bsd="yes" - oss="yes" -Index: vl.c -=================================================================== ---- vl.c.orig 2007-06-13 11:51:54.000000000 +0100 -+++ vl.c 2007-06-13 11:51:56.000000000 +0100 -@@ -47,6 +47,8 @@ - #ifndef __APPLE__ - #include - #endif -+#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) -+#include - #else - #ifndef __sun__ - #include -@@ -3454,7 +3456,7 @@ static TAPState *net_tap_fd_init(VLANSta - return s; - } - --#ifdef _BSD -+#if defined (_BSD) || defined (__FreeBSD_kernel__) - static int tap_open(char *ifname, int ifname_size) - { - int fd; diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch deleted file mode 100644 index 54e02eff8b..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- - arm.ld | 7 +++++++ - i386.ld | 7 +++++++ - 2 files changed, 14 insertions(+) - -Index: arm.ld -=================================================================== ---- arm.ld.orig 2007-06-13 11:48:22.000000000 +0100 -+++ arm.ld 2007-06-13 11:51:56.000000000 +0100 -@@ -26,6 +26,10 @@ SECTIONS - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } -+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } -+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } -+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } -+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } -@@ -58,6 +62,9 @@ SECTIONS - .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } - __exidx_end = .; - .reginfo : { *(.reginfo) } -+ /* Thread Local Storage sections */ -+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } -+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x100000) + (. & (0x100000 - 1)); -Index: i386.ld -=================================================================== ---- i386.ld.orig 2007-06-13 11:48:22.000000000 +0100 -+++ i386.ld 2007-06-13 11:51:56.000000000 +0100 -@@ -28,6 +28,10 @@ SECTIONS - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } -+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } -+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } -+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } -+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } -@@ -53,6 +57,9 @@ SECTIONS - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f -+ /* Thread Local Storage sections */ -+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } -+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch deleted file mode 100644 index 5280a5bd4a..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch +++ /dev/null @@ -1,18 +0,0 @@ -=== modified file 'sdl.c' ---- - sdl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: sdl.c -=================================================================== ---- sdl.c.orig 2007-06-13 11:48:22.000000000 +0100 -+++ sdl.c 2007-06-13 11:51:56.000000000 +0100 -@@ -241,7 +241,7 @@ static void sdl_hide_cursor(void) - - if (kbd_mouse_is_absolute()) { - SDL_ShowCursor(1); -- SDL_SetCursor(sdl_cursor_hidden); -+ /* SDL_SetCursor(sdl_cursor_hidden); */ - } else { - SDL_ShowCursor(0); - } diff --git a/recipes/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch b/recipes/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch deleted file mode 100644 index 4911ac131f..0000000000 --- a/recipes/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch +++ /dev/null @@ -1,223 +0,0 @@ -=== modified file 'hw/pl110.c' ---- - hw/pl110.c | 13 ++++-- - hw/pl110_template.h | 107 ++++++++++++++++++++++++++++++++++++---------------- - 2 files changed, 86 insertions(+), 34 deletions(-) - -Index: hw/pl110.c -=================================================================== ---- hw/pl110.c.orig 2007-06-13 11:48:22.000000000 +0100 -+++ hw/pl110.c 2007-06-13 11:51:57.000000000 +0100 -@@ -10,6 +10,7 @@ - #include "vl.h" - - #define PL110_CR_EN 0x001 -+#define PL110_CR_BGR 0x100 - #define PL110_CR_BEBO 0x200 - #define PL110_CR_BEPO 0x400 - #define PL110_CR_PWR 0x800 -@@ -114,6 +115,7 @@ static void pl110_update_display(void *o - int first, last = 0; - int dirty, new_dirty; - int i; -+ int bpp_offset; - - if (!pl110_enabled(s)) - return; -@@ -145,12 +147,17 @@ static void pl110_update_display(void *o - fprintf(stderr, "pl110: Bad color depth\n"); - exit(1); - } -+ if (s->cr & PL110_CR_BGR) -+ bpp_offset = 0; -+ else -+ bpp_offset = 18; -+ - if (s->cr & PL110_CR_BEBO) -- fn = fntable[s->bpp + 6]; -+ fn = fntable[s->bpp + 6 + bpp_offset]; - else if (s->cr & PL110_CR_BEPO) -- fn = fntable[s->bpp + 12]; -+ fn = fntable[s->bpp + 12 + bpp_offset]; - else -- fn = fntable[s->bpp]; -+ fn = fntable[s->bpp + bpp_offset]; - - src_width = s->cols; - switch (s->bpp) { -Index: hw/pl110_template.h -=================================================================== ---- hw/pl110_template.h.orig 2007-06-13 11:48:22.000000000 +0100 -+++ hw/pl110_template.h 2007-06-13 11: