summaryrefslogtreecommitdiffstats
path: root/meta/packages/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r--meta/packages/qemu/files/arm_nptl.patch86
-rw-r--r--meta/packages/qemu/qemu_cvs.bb4
2 files changed, 44 insertions, 46 deletions
diff --git a/meta/packages/qemu/files/arm_nptl.patch b/meta/packages/qemu/files/arm_nptl.patch
index 958c27e5e1..f9b10aebc5 100644
--- a/meta/packages/qemu/files/arm_nptl.patch
+++ b/meta/packages/qemu/files/arm_nptl.patch
@@ -1,25 +1,25 @@
1Index: qemu/configure 1Index: qemu/configure
2=================================================================== 2===================================================================
3--- qemu.orig/configure 2006-08-14 22:09:39.000000000 +0100 3--- qemu.orig/configure 2006-08-26 16:31:53.000000000 +0100
4+++ qemu/configure 2006-08-14 22:38:54.000000000 +0100 4+++ qemu/configure 2006-08-26 16:31:53.000000000 +0100
5@@ -96,6 +96,7 @@ 5@@ -97,6 +97,7 @@
6 user="no"
7 build_docs="no" 6 build_docs="no"
7 build_acpi_tables="no"
8 uname_release="" 8 uname_release=""
9+nptl="yes" 9+nptl="yes"
10 10
11 # OS specific 11 # OS specific
12 targetos=`uname -s` 12 targetos=`uname -s`
13@@ -240,6 +241,8 @@ 13@@ -243,6 +244,8 @@
14 ;; 14 ;;
15 --enable-uname-release=*) uname_release="$optarg" 15 --enable-iasl) build_acpi_tables="yes"
16 ;; 16 ;;
17+ --disable-nptl) nptl="no" 17+ --disable-nptl) nptl="no"
18+ ;; 18+ ;;
19 esac 19 esac
20 done 20 done
21 21
22@@ -438,6 +441,23 @@ 22@@ -441,6 +444,23 @@
23 fi 23 fi
24 fi 24 fi
25 25
@@ -43,7 +43,7 @@ Index: qemu/configure
43 ########################################## 43 ##########################################
44 # SDL probe 44 # SDL probe
45 45
46@@ -556,6 +576,7 @@ 46@@ -559,6 +579,7 @@
47 fi 47 fi
48 echo "FMOD support $fmod $fmod_support" 48 echo "FMOD support $fmod $fmod_support"
49 echo "kqemu support $kqemu" 49 echo "kqemu support $kqemu"
@@ -51,7 +51,7 @@ Index: qemu/configure
51 echo "Documentation $build_docs" 51 echo "Documentation $build_docs"
52 [ ! -z "$uname_release" ] && \ 52 [ ! -z "$uname_release" ] && \
53 echo "uname -r $uname_release" 53 echo "uname -r $uname_release"
54@@ -864,6 +885,14 @@ 54@@ -880,6 +901,14 @@
55 echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak 55 echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
56 fi 56 fi
57 fi 57 fi
@@ -68,8 +68,8 @@ Index: qemu/configure
68 if test "$cocoa" = "yes" ; then 68 if test "$cocoa" = "yes" ; then
69Index: qemu/exec-all.h 69Index: qemu/exec-all.h
70=================================================================== 70===================================================================
71--- qemu.orig/exec-all.h 2006-05-26 18:10:52.000000000 +0100 71--- qemu.orig/exec-all.h 2006-08-26 16:28:32.000000000 +0100
72+++ qemu/exec-all.h 2006-08-14 22:37:29.000000000 +0100 72+++ qemu/exec-all.h 2006-08-26 16:31:53.000000000 +0100
73@@ -347,163 +347,7 @@ 73@@ -347,163 +347,7 @@
74 extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; 74 extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
75 extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; 75 extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
@@ -237,8 +237,8 @@ Index: qemu/exec-all.h
237 237
238Index: qemu/linux-user/arm/syscall.h 238Index: qemu/linux-user/arm/syscall.h
239=================================================================== 239===================================================================
240--- qemu.orig/linux-user/arm/syscall.h 2005-04-27 21:11:21.000000000 +0100 240--- qemu.orig/linux-user/arm/syscall.h 2006-03-09 19:18:11.000000000 +0000
241+++ qemu/linux-user/arm/syscall.h 2006-08-14 22:37:29.000000000 +0100 241+++ qemu/linux-user/arm/syscall.h 2006-08-26 16:31:53.000000000 +0100
242@@ -28,7 +28,9 @@ 242@@ -28,7 +28,9 @@
243 #define ARM_SYSCALL_BASE 0x900000 243 #define ARM_SYSCALL_BASE 0x900000
244 #define ARM_THUMB_SYSCALL 0 244 #define ARM_THUMB_SYSCALL 0
@@ -252,9 +252,9 @@ Index: qemu/linux-user/arm/syscall.h
252 #define ARM_NR_thumb_semihosting 0xAB 252 #define ARM_NR_thumb_semihosting 0xAB
253Index: qemu/linux-user/main.c 253Index: qemu/linux-user/main.c
254=================================================================== 254===================================================================
255--- qemu.orig/linux-user/main.c 2006-05-26 18:11:01.000000000 +0100 255--- qemu.orig/linux-user/main.c 2006-08-26 16:28:40.000000000 +0100
256+++ qemu/linux-user/main.c 2006-08-14 22:37:29.000000000 +0100 256+++ qemu/linux-user/main.c 2006-08-26 16:31:53.000000000 +0100
257@@ -331,6 +331,50 @@ 257@@ -309,6 +309,50 @@
258 } 258 }
259 } 259 }
260 260
@@ -305,7 +305,7 @@ Index: qemu/linux-user/main.c
305 void cpu_loop(CPUARMState *env) 305 void cpu_loop(CPUARMState *env)
306 { 306 {
307 int trapnr; 307 int trapnr;
308@@ -387,10 +431,8 @@ 308@@ -365,10 +409,8 @@
309 } 309 }
310 } 310 }
311 311
@@ -318,7 +318,7 @@ Index: qemu/linux-user/main.c
318 env->regs[0] = do_arm_semihosting (env); 318 env->regs[0] = do_arm_semihosting (env);
319 } else if (n == 0 || n >= ARM_SYSCALL_BASE 319 } else if (n == 0 || n >= ARM_SYSCALL_BASE
320 || (env->thumb && n == ARM_THUMB_SYSCALL)) { 320 || (env->thumb && n == ARM_THUMB_SYSCALL)) {
321@@ -401,14 +443,34 @@ 321@@ -379,14 +421,34 @@
322 n -= ARM_SYSCALL_BASE; 322 n -= ARM_SYSCALL_BASE;
323 env->eabi = 0; 323 env->eabi = 0;
324 } 324 }
@@ -361,7 +361,7 @@ Index: qemu/linux-user/main.c
361 } else { 361 } else {
362 goto error; 362 goto error;
363 } 363 }
364@@ -447,6 +509,10 @@ 364@@ -425,6 +487,10 @@
365 } 365 }
366 } 366 }
367 break; 367 break;
@@ -372,7 +372,7 @@ Index: qemu/linux-user/main.c
372 default: 372 default:
373 error: 373 error:
374 fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", 374 fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n",
375@@ -1649,6 +1715,10 @@ 375@@ -1639,6 +1705,10 @@
376 ts->heap_base = info->brk; 376 ts->heap_base = info->brk;
377 /* This will be filled in on the first SYS_HEAPINFO call. */ 377 /* This will be filled in on the first SYS_HEAPINFO call. */
378 ts->heap_limit = 0; 378 ts->heap_limit = 0;
@@ -385,22 +385,22 @@ Index: qemu/linux-user/main.c
385 { 385 {
386Index: qemu/linux-user/qemu.h 386Index: qemu/linux-user/qemu.h
387=================================================================== 387===================================================================
388--- qemu.orig/linux-user/qemu.h 2006-05-26 18:11:01.000000000 +0100 388--- qemu.orig/linux-user/qemu.h 2006-08-26 16:28:40.000000000 +0100
389+++ qemu/linux-user/qemu.h 2006-08-14 22:37:29.000000000 +0100 389+++ qemu/linux-user/qemu.h 2006-08-26 16:33:50.000000000 +0100
390@@ -76,6 +76,9 @@ 390@@ -75,6 +75,9 @@
391 uint32_t v86mask; 391 uint32_t v86mask;
392 #endif 392 #endif
393 int used; /* non zero if used */ 393 int used; /* non zero if used */
394+#ifdef USE_NPTL 394+#ifdef USE_NPTL
395+ uint32_t *child_tidptr; 395+ uint32_t *child_tidptr;
396+#endif 396+#endif
397 struct image_info *info;
397 uint8_t stack[0]; 398 uint8_t stack[0];
398 } __attribute__((aligned(16))) TaskState; 399 } __attribute__((aligned(16))) TaskState;
399
400Index: qemu/linux-user/syscall.c 400Index: qemu/linux-user/syscall.c
401=================================================================== 401===================================================================
402--- qemu.orig/linux-user/syscall.c 2006-05-26 18:11:01.000000000 +0100 402--- qemu.orig/linux-user/syscall.c 2006-08-26 16:28:40.000000000 +0100
403+++ qemu/linux-user/syscall.c 2006-08-14 22:44:47.000000000 +0100 403+++ qemu/linux-user/syscall.c 2006-08-26 16:31:53.000000000 +0100
404@@ -66,9 +66,18 @@ 404@@ -66,9 +66,18 @@
405 #include <linux/kd.h> 405 #include <linux/kd.h>
406 406
@@ -420,7 +420,7 @@ Index: qemu/linux-user/syscall.c
420 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) 420 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC)
421 /* 16 bit uid wrappers emulation */ 421 /* 16 bit uid wrappers emulation */
422 #define USE_UID16 422 #define USE_UID16
423@@ -1569,20 +1578,38 @@ 423@@ -1602,20 +1611,38 @@
424 thread/process */ 424 thread/process */
425 #define NEW_STACK_SIZE 8192 425 #define NEW_STACK_SIZE 8192
426 426
@@ -460,7 +460,7 @@ Index: qemu/linux-user/syscall.c
460 460
461 if (flags & CLONE_VM) { 461 if (flags & CLONE_VM) {
462 ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE); 462 ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE);
463@@ -1627,16 +1654,60 @@ 463@@ -1665,16 +1692,60 @@
464 #error unsupported target CPU 464 #error unsupported target CPU
465 #endif 465 #endif
466 new_env->opaque = ts; 466 new_env->opaque = ts;
@@ -525,7 +525,7 @@ Index: qemu/linux-user/syscall.c
525 } 525 }
526 return ret; 526 return ret;
527 } 527 }
528@@ -1880,7 +1951,7 @@ 528@@ -1918,7 +1989,7 @@
529 ret = do_brk(arg1); 529 ret = do_brk(arg1);
530 break; 530 break;
531 case TARGET_NR_fork: 531 case TARGET_NR_fork:
@@ -534,7 +534,7 @@ Index: qemu/linux-user/syscall.c
534 break; 534 break;
535 case TARGET_NR_waitpid: 535 case TARGET_NR_waitpid:
536 { 536 {
537@@ -2836,7 +2907,8 @@ 537@@ -2989,7 +3060,8 @@
538 ret = get_errno(fsync(arg1)); 538 ret = get_errno(fsync(arg1));
539 break; 539 break;
540 case TARGET_NR_clone: 540 case TARGET_NR_clone:
@@ -544,7 +544,7 @@ Index: qemu/linux-user/syscall.c
544 break; 544 break;
545 #ifdef __NR_exit_group 545 #ifdef __NR_exit_group
546 /* new thread calls */ 546 /* new thread calls */
547@@ -3186,7 +3258,8 @@ 547@@ -3339,7 +3411,8 @@
548 #endif 548 #endif
549 #ifdef TARGET_NR_vfork 549 #ifdef TARGET_NR_vfork
550 case TARGET_NR_vfork: 550 case TARGET_NR_vfork:
@@ -554,15 +554,15 @@ Index: qemu/linux-user/syscall.c
554 break; 554 break;
555 #endif 555 #endif
556 #ifdef TARGET_NR_ugetrlimit 556 #ifdef TARGET_NR_ugetrlimit
557@@ -3681,4 +3754,3 @@ 557@@ -3838,4 +3911,3 @@
558 #endif 558 #endif
559 return ret; 559 return ret;
560 } 560 }
561- 561-
562Index: qemu/target-arm/cpu.h 562Index: qemu/target-arm/cpu.h
563=================================================================== 563===================================================================
564--- qemu.orig/target-arm/cpu.h 2006-02-20 00:33:36.000000000 +0000 564--- qemu.orig/target-arm/cpu.h 2006-03-09 19:18:27.000000000 +0000
565+++ qemu/target-arm/cpu.h 2006-08-14 22:39:35.000000000 +0100 565+++ qemu/target-arm/cpu.h 2006-08-26 16:31:53.000000000 +0100
566@@ -35,6 +35,9 @@ 566@@ -35,6 +35,9 @@
567 #define EXCP_IRQ 5 567 #define EXCP_IRQ 5
568 #define EXCP_FIQ 6 568 #define EXCP_FIQ 6
@@ -612,8 +612,8 @@ Index: qemu/target-arm/cpu.h
612 /* Return the current CPSR value. */ 612 /* Return the current CPSR value. */
613Index: qemu/target-arm/exec.h 613Index: qemu/target-arm/exec.h
614=================================================================== 614===================================================================
615--- qemu.orig/target-arm/exec.h 2005-11-26 10:38:39.000000000 +0000 615--- qemu.orig/target-arm/exec.h 2006-03-09 19:18:27.000000000 +0000
616+++ qemu/target-arm/exec.h 2006-08-14 22:37:29.000000000 +0100 616+++ qemu/target-arm/exec.h 2006-08-26 16:31:53.000000000 +0100
617@@ -51,8 +51,6 @@ 617@@ -51,8 +51,6 @@
618 618
619 /* In op_helper.c */ 619 /* In op_helper.c */
@@ -625,8 +625,8 @@ Index: qemu/target-arm/exec.h
625 625
626Index: qemu/target-arm/op.c 626Index: qemu/target-arm/op.c
627=================================================================== 627===================================================================
628--- qemu.orig/target-arm/op.c 2006-02-20 00:33:36.000000000 +0000 628--- qemu.orig/target-arm/op.c 2006-08-26 16:28:48.000000000 +0100
629+++ qemu/target-arm/op.c 2006-08-14 22:37:29.000000000 +0100 629+++ qemu/target-arm/op.c 2006-08-26 16:31:53.000000000 +0100
630@@ -891,6 +891,12 @@ 630@@ -891,6 +891,12 @@
631 cpu_loop_exit(); 631 cpu_loop_exit();
632 } 632 }
@@ -642,9 +642,9 @@ Index: qemu/target-arm/op.c
642 "d" suffix. */ 642 "d" suffix. */
643Index: qemu/target-arm/translate.c 643Index: qemu/target-arm/translate.c
644=================================================================== 644===================================================================
645--- qemu.orig/target-arm/translate.c 2006-05-26 18:11:04.000000000 +0100 645--- qemu.orig/target-arm/translate.c 2006-08-26 16:28:48.000000000 +0100
646+++ qemu/target-arm/translate.c 2006-08-14 22:37:29.000000000 +0100 646+++ qemu/target-arm/translate.c 2006-08-26 16:31:53.000000000 +0100
647@@ -2377,6 +2377,7 @@ 647@@ -2382,6 +2382,7 @@
648 s->is_jmp = DISAS_JUMP; 648 s->is_jmp = DISAS_JUMP;
649 } 649 }
650 650
@@ -652,7 +652,7 @@ Index: qemu/target-arm/translate.c
652 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for 652 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
653 basic block 'tb'. If search_pc is TRUE, also generate PC 653 basic block 'tb'. If search_pc is TRUE, also generate PC
654 information for each intermediate instruction. */ 654 information for each intermediate instruction. */
655@@ -2411,6 +2412,15 @@ 655@@ -2416,6 +2417,15 @@
656 nb_gen_labels = 0; 656 nb_gen_labels = 0;
657 lj = -1; 657 lj = -1;
658 do { 658 do {
@@ -671,7 +671,7 @@ Index: qemu/target-arm/translate.c
671Index: qemu/qemu_spinlock.h 671Index: qemu/qemu_spinlock.h
672=================================================================== 672===================================================================
673--- /dev/null 1970-01-01 00:00:00.000000000 +0000 673--- /dev/null 1970-01-01 00:00:00.000000000 +0000
674+++ qemu/qemu_spinlock.h 2006-08-14 22:37:29.000000000 +0100 674+++ qemu/qemu_spinlock.h 2006-08-26 16:31:53.000000000 +0100
675@@ -0,0 +1,182 @@ 675@@ -0,0 +1,182 @@
676+/* 676+/*
677+ * internal execution defines for qemu 677+ * internal execution defines for qemu
diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb
index 3675be4a72..5113538b9e 100644
--- a/meta/packages/qemu/qemu_cvs.bb
+++ b/meta/packages/qemu/qemu_cvs.bb
@@ -1,10 +1,8 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2PV = "0.8.0+cvs${SRCDATE}" 2PV = "0.8.2+cvs${SRCDATE}"
3PR = "r2"
4 3
5SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ 4SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
6 file://configure.patch;patch=1 \ 5 file://configure.patch;patch=1 \
7 file://mouse_fix-r0.patch;patch=1 \
8 file://arm_nptl.patch;patch=1 \ 6 file://arm_nptl.patch;patch=1 \
9 file://pl110_rgb-r0.patch;patch=1" 7 file://pl110_rgb-r0.patch;patch=1"
10 8
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 10:37:25 +0000