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

build fix for travis 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXgoC2AAoJEK0ScMxN0CebFYYH/0qd//1eH+RybvjiEzzj8MsD
 EAvT+IexJv5Vk95ZrrPoo2gw/lJzLcpoKQc5hTbyjJUfqXECifAofsOsmXdi5Fp0
 A8VsVGfbToSm+wwOs5qyKBdKV2A2HU9GTyGlS6Y4P6FqWwAzjaI4cn2cVzp7DuMn
 b2S2Wkbz1hQrbRc6AofET2FJHY40+FUgILonuwWL2MlCARUp31pIVjazloTv+776
 mikAFoM3OE5iRkWT9/OPLqJgXaCXcAvoIzVtDi/t/6Q9wpNk+iMDB4/i42R0/81a
 T5ZrxsrvvUgfYUs10sEqVnmrKkWlACOmOsu5ZHGKCGIc4zwAEWPpu9KShtGXTAU=
 =Sk9a
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/rth/tags/pull-rth-20160710' into staging

build fix for travis

# gpg: Signature made Sun 10 Jul 2016 18:07:02 BST
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-rth-20160710:
  build: Use $(AS) for optionrom explicitly
  linux-user: Fix i386 safe-syscall.S

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-11 14:10:09 +01:00
parent f7d3f8c0c0 cdbd727c20
commit b3b22db69f
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -368,6 +368,7 @@ else
fi fi
ar="${AR-${cross_prefix}ar}" ar="${AR-${cross_prefix}ar}"
as="${AS-${cross_prefix}as}"
ccas="${CCAS-$cc}" ccas="${CCAS-$cc}"
cpp="${CPP-$cc -E}" cpp="${CPP-$cc -E}"
objcopy="${OBJCOPY-${cross_prefix}objcopy}" objcopy="${OBJCOPY-${cross_prefix}objcopy}"
@ -4490,13 +4491,6 @@ if test "$fortify_source" != "no"; then
fi fi
fi fi
#################################################
# clang does not support the 16-bit assembly for roms
if echo | $ccas -dM -E - | grep __clang__ > /dev/null 2>&1 ; then
ccas="$ccas -fno-integrated-as"
fi
########################################## ##########################################
# check if struct fsxattr is available via linux/fs.h # check if struct fsxattr is available via linux/fs.h
@ -5515,6 +5509,7 @@ echo "CXX=$cxx" >> $config_host_mak
echo "OBJCC=$objcc" >> $config_host_mak echo "OBJCC=$objcc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak echo "AR=$ar" >> $config_host_mak
echo "ARFLAGS=$ARFLAGS" >> $config_host_mak echo "ARFLAGS=$ARFLAGS" >> $config_host_mak
echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak
echo "CPP=$cpp" >> $config_host_mak echo "CPP=$cpp" >> $config_host_mak
echo "OBJCOPY=$objcopy" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak
@ -5988,6 +5983,7 @@ for rom in seabios vgabios ; do
config_mak=roms/$rom/config.mak config_mak=roms/$rom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak
echo "AS=$as" >> $config_mak
echo "CCAS=$ccas" >> $config_mak echo "CCAS=$ccas" >> $config_mak
echo "CC=$cc" >> $config_mak echo "CC=$cc" >> $config_mak
echo "BCC=bcc" >> $config_mak echo "BCC=bcc" >> $config_mak

24
linux-user/host/i386/safe-syscall.inc.S
View File

@ -69,7 +69,7 @@ safe_syscall_base:
safe_syscall_start: safe_syscall_start:
/* if signal_pending is non-zero, don't do the call */ /* if signal_pending is non-zero, don't do the call */
mov 4+16(%esp), %eax /* signal_pending */ mov 4+16(%esp), %eax /* signal_pending */
cmp $0, (%eax) cmpl $0, (%eax)
jnz 1f jnz 1f
mov 8+16(%esp), %eax /* syscall number */ mov 8+16(%esp), %eax /* syscall number */
int $0x80 int $0x80
@ -77,16 +77,16 @@ safe_syscall_end:
/* code path for having successfully executed the syscall */ /* code path for having successfully executed the syscall */
pop %ebx pop %ebx
.cfi_remember_state .cfi_remember_state
.cfi_def_cfa_offset -4 .cfi_adjust_cfa_offset -4
.cfi_restore ebx .cfi_restore ebx
pop %edi pop %edi
.cfi_def_cfa_offset -4 .cfi_adjust_cfa_offset -4
.cfi_restore edi .cfi_restore edi
pop %esi pop %esi
.cfi_def_cfa_offset -4 .cfi_adjust_cfa_offset -4
.cfi_restore esi .cfi_restore esi
pop %ebp pop %ebp
.cfi_def_cfa_offset -4 .cfi_adjust_cfa_offset -4
.cfi_restore ebp .cfi_restore ebp
ret ret
@ -94,19 +94,7 @@ safe_syscall_end:
/* code path when we didn't execute the syscall */ /* code path when we didn't execute the syscall */
.cfi_restore_state .cfi_restore_state
mov $-TARGET_ERESTARTSYS, %eax mov $-TARGET_ERESTARTSYS, %eax
pop %ebx jmp safe_syscall_end
.cfi_def_cfa_offset -4
.cfi_restore ebx
pop %edi
.cfi_def_cfa_offset -4
.cfi_restore edi
pop %esi
.cfi_def_cfa_offset -4
.cfi_restore esi
pop %ebp
.cfi_def_cfa_offset -4
.cfi_restore ebp
ret
.cfi_endproc .cfi_endproc
.size safe_syscall_base, .-safe_syscall_base .size safe_syscall_base, .-safe_syscall_base

3
pc-bios/optionrom/Makefile
View File

@ -20,6 +20,9 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin
# suppress auto-removal of intermediate files # suppress auto-removal of intermediate files
.SECONDARY: .SECONDARY:
%.o: %.S
$(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@," AS $(TARGET_DIR)$@")
%.img: %.o %.img: %.o
$(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@")

2
rules.mak
View File

@ -69,7 +69,7 @@ LINK = $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o
$(version-obj-y) $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@") $(version-obj-y) $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@")
%.o: %.S %.o: %.S
$(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CCAS $(TARGET_DIR)$@")
%.o: %.cc %.o: %.cc
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@") $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")