+++ /dev/null
-#DPATCHLEVEL=0
----
-# linux-user/main.c | 8 ++++----
-# 1 file changed, 4 insertions(+), 4 deletions(-)
-#
-Index: linux-user/main.c
-===================================================================
---- linux-user/main.c.orig 2008-04-24 20:15:46.000000000 +0100
-+++ linux-user/main.c 2008-04-24 20:15:53.000000000 +0100
-@@ -765,7 +765,7 @@
- default:
- printf ("Unhandled trap: 0x%x\n", trapnr);
- cpu_dump_state(env, stderr, fprintf, 0);
-- exit (1);
-+ _exit (1);
- }
- process_pending_signals (env);
- }
-@@ -1697,7 +1697,7 @@
- default:
- printf ("Unhandled trap: 0x%x\n", trapnr);
- cpu_dump_state(env, stderr, fprintf, 0);
-- exit (1);
-+ _exit (1);
- }
- process_pending_signals (env);
- }
-@@ -2026,7 +2026,7 @@
- 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")) {
-@@ -2045,7 +2045,7 @@
- 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++]);
+++ /dev/null
-#DPATCHLEVEL=0
----
-# linux-user/signal.c | 5 +++++
-# 1 file changed, 5 insertions(+)
-#
-Index: linux-user/signal.c
-===================================================================
---- linux-user/signal.c.orig 2008-04-24 20:15:55.000000000 +0100
-+++ linux-user/signal.c 2008-04-24 20:15:57.000000000 +0100
-@@ -512,6 +512,11 @@
-
- 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",
+++ /dev/null
-Index: qemu-0.10.3/net.c
-===================================================================
---- qemu-0.10.3.orig/net.c 2009-05-19 17:46:54.650870195 +0400
-+++ qemu-0.10.3/net.c 2009-05-19 17:47:05.612854521 +0400
-@@ -955,7 +955,7 @@
- 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
+++ /dev/null
-Index: linux-user/syscall.c
-===================================================================
---- linux-user/syscall.c.orig 2008-04-24 20:15:46.000000000 +0100
-+++ linux-user/syscall.c 2008-04-24 20:15:59.000000000 +0100
-@@ -250,6 +250,7 @@
- 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*);
-
- #define ERRNO_TABLE_SIZE 1200
-
-@@ -4041,7 +4042,8 @@
- #endif
- #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:
+++ /dev/null
-#DPATCHLEVEL=0
----
-# linux-user/syscall.c | 32 +++++++++++++++++++++++++++++---
-# 1 file changed, 29 insertions(+), 3 deletions(-)
-#
-Index: linux-user/syscall.c
-===================================================================
---- linux-user/syscall.c.orig 2009-05-19 17:50:28.000000000 +0400
-+++ linux-user/syscall.c 2009-05-19 17:52:19.094103462 +0400
-@@ -55,6 +55,7 @@
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
- #include <qemu-common.h>
-+#include <sys/sysctl.h>
- #ifdef HAVE_GPROF
- #include <sys/gmon.h>
- #endif
-@@ -5193,9 +5194,34 @@
- break;
- #endif
- case TARGET_NR__sysctl:
-- /* We don't implement this, but ENOTDIR is always a safe
-- return value. */
-- ret = -TARGET_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:
- {
+++ /dev/null
----
- hw/ne2000.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: trunk/hw/ne2000.c
-===================================================================
---- trunk.orig/hw/ne2000.c 2008-04-24 20:15:46.000000000 +0100
-+++ trunk/hw/ne2000.c 2008-04-24 20:16:05.000000000 +0100
-@@ -217,7 +217,7 @@
- NE2000State *s = opaque;
-
- if (s->cmd & E8390_STOP)
-- return 1;
-+ return 0;
- return !ne2000_buffer_full(s);
- }
-
+++ /dev/null
-#DPATCHLEVEL=0
----
-# dyngen-exec.h | 4 ++--
-# 1 file changed, 2 insertions(+), 2 deletions(-)
-#
-Index: dyngen-exec.h
-===================================================================
---- dyngen-exec.h.orig 2009-05-01 21:02:44.000000000 +0400
-+++ dyngen-exec.h 2009-05-19 17:56:28.164854448 +0400
-@@ -41,7 +41,7 @@
- // Linux/Sparc64 defines uint64_t
- #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
- /* XXX may be done for all 64 bits targets ? */
--#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
-+#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) || defined(__sparc__)
- typedef unsigned long uint64_t;
- #else
- typedef unsigned long long uint64_t;
-@@ -58,7 +58,7 @@
- typedef signed int int32_t;
- // Linux/Sparc64 defines int64_t
- #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
--#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
-+#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) || defined(__sparc__)
- typedef signed long int64_t;
- #else
- typedef signed long long int64_t;
+++ /dev/null
-#DPATCHLEVEL=0
----
-# sparc.ld | 2 +-
-# 1 file changed, 1 insertion(+), 1 deletion(-)
-#
-Index: sparc.ld
-===================================================================
---- sparc.ld.orig 2008-04-24 20:15:46.000000000 +0100
-+++ sparc.ld 2008-04-24 20:16:07.000000000 +0100
-@@ -6,7 +6,7 @@
- SECTIONS
- {
- /* Read-only sections, merged into text segment: */
-- . = 0x60000000 + SIZEOF_HEADERS;
-+ . = 0x60000000 + 0x400;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
+++ /dev/null
-#DPATCHLEVEL=1
----
-# cpu-all.h | 2 +-
-# 1 file changed, 1 insertion(+), 1 deletion(-)
-#
-Index: qemu-0.10.3/cpu-all.h
-===================================================================
---- qemu-0.10.3.orig/cpu-all.h 2009-05-01 21:02:44.000000000 +0400
-+++ qemu-0.10.3/cpu-all.h 2009-05-19 17:59:28.357103179 +0400
-@@ -288,7 +288,7 @@
- static inline void stl_le_p(void *ptr, int v)
- {
- #ifdef _ARCH_PPC
-- __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;
+++ /dev/null
----
- arm.ld | 7 +++++++
- i386.ld | 7 +++++++
- 2 files changed, 14 insertions(+)
-
-Index: arm.ld
-===================================================================
---- arm.ld.orig 2008-04-24 20:15:45.000000000 +0100
-+++ arm.ld 2008-04-24 20:16:11.000000000 +0100
-@@ -26,6 +26,10 @@
- { *(.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 @@
- .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 2008-04-24 20:15:45.000000000 +0100
-+++ i386.ld 2008-04-24 20:16:11.000000000 +0100
-@@ -28,6 +28,10 @@
- { *(.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 @@
- _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) }
+++ /dev/null
-=== modified file 'sdl.c'
----
- sdl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sdl.c
-===================================================================
---- sdl.c.orig 2008-04-24 20:15:45.000000000 +0100
-+++ sdl.c 2008-04-24 20:16:12.000000000 +0100
-@@ -247,7 +247,7 @@
-
- if (kbd_mouse_is_absolute()) {
- SDL_ShowCursor(1);
-- SDL_SetCursor(sdl_cursor_hidden);
-+ /* SDL_SetCursor(sdl_cursor_hidden); */
- } else {
- SDL_ShowCursor(0);
- }
+++ /dev/null
-Index: trunk/hw/baum.c
-===================================================================
---- trunk.orig/hw/baum.c 2008-11-29 05:12:40.418390606 +0300
-+++ trunk/hw/baum.c 2008-11-29 05:13:11.498378426 +0300
-@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void)
- CharDriverState *chr;
- brlapi_handle_t *handle;
- #ifdef CONFIG_SDL
-+#ifdef SDL_VIDEO_DRIVER_X11
- SDL_SysWMinfo info;
- #endif
-+#endif
- int tty;
-
- baum = qemu_mallocz(sizeof(BaumDriverState));
-@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void)
- }
-
- #ifdef CONFIG_SDL
-+#ifdef SDL_VIDEO_DRIVER_X11
- memset(&info, 0, sizeof(info));
- SDL_VERSION(&info.version);
- if (SDL_GetWMInfo(&info))
- tty = info.info.x11.wmwindow;
- else
- #endif
-+#endif
- tty = BRLAPI_TTY_DEFAULT;
-
- if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {
+++ /dev/null
---- qemu-0.10.3/block-vvfat.c.orig 2009-05-01 21:02:44 +0400
-+++ qemu-0.10.3/block-vvfat.c 2009-12-15 22:06:04 +0300
-@@ -865,7 +865,9 @@
- {
- direntry_t* entry=array_get_next(&(s->directory));
- entry->attributes=0x28; /* archive | volume label */
-- snprintf((char*)entry->name,11,"QEMU VVFAT");
-+ /* snprintf((char*)entry->name,11,"QEMU VVFAT"); */
-+ snprintf(entry->name, sizeof(entry->name), "QEMU VV");
-+ snprintf(entry->extension, sizeof(entry->extension), "FAT");
- }
-
- /* Now build FAT, and write back information into directory */
+++ /dev/null
----
- linux-user/syscall.c | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-Index: qemu-0.10.3/linux-user/syscall.c
-===================================================================
---- qemu-0.10.3.orig/linux-user/syscall.c 2009-05-19 18:18:04.000000000 +0400
-+++ qemu-0.10.3/linux-user/syscall.c 2009-05-19 18:18:40.397103379 +0400
-@@ -6024,28 +6024,6 @@
- goto unimplemented_nowarn;
- #endif
-
--#ifdef TARGET_NR_clock_gettime
-- case TARGET_NR_clock_gettime:
-- {
-- struct timespec ts;
-- ret = get_errno(clock_gettime(arg1, &ts));
-- if (!is_error(ret)) {
-- host_to_target_timespec(arg2, &ts);
-- }
-- break;
-- }
--#endif
--#ifdef TARGET_NR_clock_getres
-- case TARGET_NR_clock_getres:
-- {
-- struct timespec ts;
-- ret = get_errno(clock_getres(arg1, &ts));
-- if (!is_error(ret)) {
-- host_to_target_timespec(arg2, &ts);
-- }
-- break;
-- }
--#endif
- #ifdef TARGET_NR_clock_nanosleep
- case TARGET_NR_clock_nanosleep:
- {
+++ /dev/null
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile 2008-04-24 20:15:37.000000000 +0100
-+++ trunk/Makefile 2008-04-24 20:16:30.000000000 +0100
-@@ -196,7 +196,7 @@
- install: all $(if $(BUILD_DOCS),install-doc)
- mkdir -p "$(DESTDIR)$(bindir)"
- ifneq ($(TOOLS),)
-- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
-+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
- endif
- mkdir -p "$(DESTDIR)$(datadir)"
- set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-Index: trunk/Makefile.target
-===================================================================
---- trunk.orig/Makefile.target 2008-04-24 20:15:37.000000000 +0100
-+++ trunk/Makefile.target 2008-04-24 20:16:30.000000000 +0100
-@@ -685,7 +685,7 @@
-
- install: all
- ifneq ($(PROGS),)
-- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
- endif
-
- # Include automatically generated dependency files
+++ /dev/null
-inherit native
-
-DEPENDS = "libsdl-native zlib-native"
-
-export OS_CFLAGS="${CFLAGS} ${LDFLAGS}"
-
+++ /dev/null
-require qemu_${PV}.bb
-require qemu-native.inc
+++ /dev/null
-LICENSE = "GPL"
-DEPENDS = "zlib"
-
-PR = "r1"
-
-FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
-FILESDIR = "${WORKDIR}"
-
-SRC_URI = "\
- http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
- file://06_exit_segfault.patch;patch=1;pnum=0 \
- file://11_signal_sigaction.patch;patch=1;pnum=0 \
- file://22_net_tuntap_stall.patch;patch=1 \
- file://31_syscalls.patch;patch=1;pnum=0 \
- file://32_syscall_sysctl.patch;patch=1;pnum=0 \
- file://52_ne2000_return.patch;patch=1 \
- file://61_safe_64bit_int.patch;patch=1;pnum=0 \
- file://63_sparc_build.patch;patch=1;pnum=0 \
- file://64_ppc_asm_constraints.patch;patch=1 \
- file://66_tls_ld.patch;patch=1;pnum=0 \
- file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \
- file://fix_segfault.patch;patch=1 \
- file://no-strip.patch;patch=1 \
- file://fix_baum_c_compilation.patch;patch=1 \
- file://fix_fortify_source_compilation.patch;patch=1 \
- "
-
-S = "${WORKDIR}/qemu-${PV}"
-
-EXTRA_OECONF += "--disable-gfx-check"
-
-inherit autotools
-
-do_configure() {
- ${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
-}
git.openpandora.org / openembedded.git / commitdiff