falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for building on 32 bit host systems

This commit is contained in:
kub 2018-05-31 23:24:21 +02:00 committed by queueRAM
parent 4cb644d4b0
commit b9d1f49337
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -6836,6 +6836,7 @@ case "$target_name" in
solaris) solaris)
TARGET_ARCH=sparc TARGET_ARCH=sparc
TARGET_ABI_DIR=solaris TARGET_ABI_DIR=solaris
TARGET_BASE_ARCH=sparc
echo "TARGET_ABI_SOLARIS=y" >> $config_target_mak echo "TARGET_ABI_SOLARIS=y" >> $config_target_mak
;; ;;
solaris64) solaris64)

6
linux-user/elfload.c
View File

@ -2067,6 +2067,8 @@ abi_ulong sgi_map_elf_image(int image_fd, struct elf_phdr *phdr, int phnum)
} }
} }
mmap_lock();
/* The image indicates that it can be loaded anywhere. Find a /* The image indicates that it can be loaded anywhere. Find a
location that can hold the memory space required. If the location that can hold the memory space required. If the
image is pre-linked, LOADDR will be non-zero. Since we do image is pre-linked, LOADDR will be non-zero. Since we do
@ -2113,9 +2115,13 @@ abi_ulong sgi_map_elf_image(int image_fd, struct elf_phdr *phdr, int phnum)
} }
} }
mmap_unlock();
return load_bias + phdr[0].p_vaddr; return load_bias + phdr[0].p_vaddr;
exit_perror: exit_perror:
mmap_unlock();
errmsg = strerror(errno); errmsg = strerror(errno);
fprintf(stderr, "error in syssgi elfmap: %s\n", errmsg); fprintf(stderr, "error in syssgi elfmap: %s\n", errmsg);
return -ENOEXEC; return -ENOEXEC;

14
linux-user/syscall_defs.h
View File

@ -1622,7 +1622,7 @@ struct target_stat {
abi_long target_st_ctime; abi_long target_st_ctime;
abi_ulong __unused3; abi_ulong __unused3;
abi_int st_blksize; abi_int st_blksize;
int64_t st_blocks; abi_llong st_blocks;
char st_fstype[16]; char st_fstype[16];
abi_long __unused4[8]; abi_long __unused4[8];
}; };
@ -1631,14 +1631,14 @@ struct target_stat {
struct target_stat64 { struct target_stat64 {
abi_ulong st_dev; abi_ulong st_dev;
abi_long st_pad1[3]; abi_long st_pad1[3];
uint64_t st_ino; abi_ullong st_ino;
abi_uint st_mode; abi_uint st_mode;
abi_uint st_nlink; abi_uint st_nlink;
abi_int st_uid; abi_int st_uid;
abi_int st_gid; abi_int st_gid;
abi_ulong st_rdev; abi_ulong st_rdev;
abi_long st_pad2[2]; abi_long st_pad2[2];
int64_t st_size; abi_llong st_size;
abi_long target_st_atime; abi_long target_st_atime;
abi_ulong __unused1; abi_ulong __unused1;
abi_long target_st_mtime; abi_long target_st_mtime;
@ -1646,7 +1646,7 @@ struct target_stat64 {
abi_long target_st_ctime; abi_long target_st_ctime;
abi_ulong __unused3; abi_ulong __unused3;
abi_int st_blksize; abi_int st_blksize;
int64_t st_blocks; abi_llong st_blocks;
char st_fstype[16]; char st_fstype[16];
abi_long __unused4[8]; abi_long __unused4[8];
}; };
@ -1977,7 +1977,7 @@ struct target_stat {
struct target_stat64 { struct target_stat64 {
uint32_t st_dev; uint32_t st_dev;
abi_long st_pad0[3]; /* Reserved for st_dev expansion */ abi_long st_pad0[3]; /* Reserved for st_dev expansion */
uint64_t st_ino; abi_ullong st_ino;
uint32_t st_mode; uint32_t st_mode;
uint32_t st_nlink; uint32_t st_nlink;
@ -1987,7 +1987,7 @@ struct target_stat64 {
uint32_t st_rdev; uint32_t st_rdev;
abi_long st_pad1[2]; /* Reserved for st_rdev expansion */ abi_long st_pad1[2]; /* Reserved for st_rdev expansion */
int64_t st_size; abi_llong st_size;
abi_long st_pad2; abi_long st_pad2;
/* /*
@ -2004,7 +2004,7 @@ struct target_stat64 {
abi_long target_st_ctime_nsec; abi_long target_st_ctime_nsec;
abi_long st_blksize; abi_long st_blksize;
int64_t st_blocks; abi_llong st_blocks;
char st_fstype[16]; char st_fstype[16];
abi_long st_projid; abi_long st_projid;
abi_long st_pad[7]; abi_long st_pad[7];

9
tcg/i386/tcg-target.inc.c
View File

@ -2696,6 +2696,12 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
case INDEX_op_x86_packus_vec: case INDEX_op_x86_packus_vec:
insn = packus_insn[vece]; insn = packus_insn[vece];
goto gen_simd; goto gen_simd;
#if TCG_TARGET_REG_BITS == 32
case INDEX_op_dup2_vec:
/* Constraints have already placed both 32-bit inputs in xmm regs. */
insn = OPC_PUNPCKLDQ;
goto gen_simd;
#endif
gen_simd: gen_simd:
tcg_debug_assert(insn != OPC_UD2); tcg_debug_assert(insn != OPC_UD2);
if (type == TCG_TYPE_V256) { if (type == TCG_TYPE_V256) {
@ -3045,6 +3051,9 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op)
case INDEX_op_x86_vperm2i128_vec: case INDEX_op_x86_vperm2i128_vec:
case INDEX_op_x86_punpckl_vec: case INDEX_op_x86_punpckl_vec:
case INDEX_op_x86_punpckh_vec: case INDEX_op_x86_punpckh_vec:
#if TCG_TARGET_REG_BITS == 32
case INDEX_op_dup2_vec:
#endif
return &x_x_x; return &x_x_x;
case INDEX_op_dup_vec: case INDEX_op_dup_vec:
case INDEX_op_shli_vec: case INDEX_op_shli_vec: