[Qemu-devel] Patch to fix Mac OS X compilation

[Jonas Maebe <jonas.maebe@elis.ugent.be>]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

Hello,

I've attached a patch to fix Mac OS X compilation (and some small 
cleanup of the Mach-O code in dyngen.c as well). Unfortunately, qemu 
"crashes" (i.e., reports a fatal error) almost immediately when trying 
to boot freedos, so it seems there are more errors. Hopefully, someone 
else can fix those now that compilation works again.


Jonas

[-- Attachment #2: qemu-macosx.patch --]
[-- Type: application/octet-stream, Size: 1409 bytes --]

Index: dyngen.c
===================================================================
RCS file: /cvsroot/qemu/qemu/dyngen.c,v
retrieving revision 1.37
diff -r1.37 dyngen.c
999c999
< 		case PPC_RELOC_LO16: fetch_next_pair_value(rel+1, &other_half); sectoffset = (sectoffset & 0xffff);
---
> 		case PPC_RELOC_LO16: fetch_next_pair_value(rel+1, &other_half); sectoffset |= (other_half << 16);
1001c1001
< 		case PPC_RELOC_HI16: fetch_next_pair_value(rel+1, &other_half); sectoffset = (other_half & 0xffff);
---
> 		case PPC_RELOC_HI16: fetch_next_pair_value(rel+1, &other_half); sectoffset |= ((uint16_t)(other_half & 0xffff));
1003c1003
< 		case PPC_RELOC_HA16: fetch_next_pair_value(rel+1, &other_half); sectoffset = (other_half & 0xffff);
---
> 		case PPC_RELOC_HA16: fetch_next_pair_value(rel+1, &other_half); sectoffset += ((int16_t)(other_half & 0xffff));
1149d1148
<         const char *name;
1152d1150
<         name = find_str_by_index(sym->n_un.n_strx);
1155c1153
< 		if ( sym->n_type & N_STAB ) /* Debug symbols are skipped */
---
> 		if ( syment->n_type & N_STAB ) /* Debug symbols are skipped */
1840c1838
< 					if(!sym_name)
---
> 					if(!sym_name && (type != PPC_RELOC_BR24))
Index: osdep.c
===================================================================
RCS file: /cvsroot/qemu/qemu/osdep.c,v
retrieving revision 1.7
diff -r1.7 osdep.c
276c276
< #include <malloc.h>
---
> #include <stdlib.h>