Support for MIPS toolchains without FPU support was added upstream, so remove our patch. patches/310-mips-link-tool.patch was a backport form this version of valgrind src/abort.c is not referenced anywhere Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>master
parent
4e07167eff
commit
7e6c53dac9
@ -1,52 +0,0 @@ |
|||||||
--- a/VEX/priv/guest_mips_helpers.c
|
|
||||||
+++ b/VEX/priv/guest_mips_helpers.c
|
|
||||||
@@ -1201,6 +1201,7 @@ extern UInt mips_dirtyhelper_calculate_F
|
|
||||||
flt_op inst )
|
|
||||||
{
|
|
||||||
UInt ret = 0;
|
|
||||||
+#ifndef __mips_soft_float
|
|
||||||
#if defined(__mips__)
|
|
||||||
VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
|
|
||||||
UInt loFsVal, hiFsVal, loFtVal, hiFtVal;
|
|
||||||
@@ -1320,6 +1321,7 @@ extern UInt mips_dirtyhelper_calculate_F
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1329,6 +1331,7 @@ extern UInt mips_dirtyhelper_calculate_F
|
|
||||||
flt_op inst )
|
|
||||||
{
|
|
||||||
UInt ret = 0;
|
|
||||||
+#ifndef __mips_soft_float
|
|
||||||
#if defined(__mips__)
|
|
||||||
#if defined(VGA_mips32)
|
|
||||||
VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
|
|
||||||
@@ -1439,6 +1442,7 @@ extern UInt mips_dirtyhelper_calculate_F
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/coregrind/m_machine.c
|
|
||||||
+++ b/coregrind/m_machine.c
|
|
||||||
@@ -1652,6 +1652,7 @@ Bool VG_(machine_get_hwcaps)( void )
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef __mips_soft_float
|
|
||||||
/* Check if CPU has FPU and 32 dbl. prec. FP registers */
|
|
||||||
int FIR = 0;
|
|
||||||
__asm__ __volatile__(
|
|
||||||
@@ -1661,6 +1662,7 @@ Bool VG_(machine_get_hwcaps)( void )
|
|
||||||
if (FIR & (1 << FP64)) {
|
|
||||||
vai.hwcaps |= VEX_PRID_CPU_32FPR;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
VG_(convert_sigaction_fromK_to_toK)(&saved_sigill_act, &tmp_sigill_act);
|
|
||||||
VG_(sigaction)(VKI_SIGILL, &tmp_sigill_act, NULL);
|
|
@ -1,38 +0,0 @@ |
|||||||
r15754 | petarj | 2015-12-29 20:14:37 +0100 (Tue, 29 Dec 2015) | 8 lines
|
|
||||||
|
|
||||||
mips: remove link script exception for MIPS arch
|
|
||||||
|
|
||||||
Current toolchains on MIPS targets that we care about are reasonably
|
|
||||||
modern and we do not need this link script exception for MIPS anymore.
|
|
||||||
|
|
||||||
This should fix issues with newer toolchain versions and .MIPS.abiflags
|
|
||||||
section.
|
|
||||||
|
|
||||||
--- a/coregrind/link_tool_exe_linux.in
|
|
||||||
+++ b/coregrind/link_tool_exe_linux.in
|
|
||||||
@@ -69,24 +69,7 @@ shift; # Remove $ala from @ARGV
|
|
||||||
die "Bogus alt-load address"
|
|
||||||
if (length($ala) < 3 || index($ala, "0x") != 0);
|
|
||||||
|
|
||||||
-# For mips32 or mips64 we need to use "--section-start=.reginfo=$ala" or
|
|
||||||
-# "--section-start=.MIPS.options=$ala" respectively, because "-Ttext=$ala" will
|
|
||||||
-# not put all the sections to the specificed address ($ala).
|
|
||||||
-my $x = `cat ../config.log 2>&1 | grep host_cpu= | sed "s/host_cpu='//g"`;
|
|
||||||
-my $arch = substr($x, 0, index($x, "'"));
|
|
||||||
-
|
|
||||||
-my $extra_args;
|
|
||||||
-if (($arch eq 'mips') || ($arch eq 'mipsel')
|
|
||||||
- || ($arch eq 'mipsisa32r2el')) {
|
|
||||||
- $extra_args = "-static -Wl,--section-start=.reginfo=$ala";
|
|
||||||
-} elsif (($arch eq 'mips64') || ($arch eq 'mips64el') ||
|
|
||||||
- ($arch eq 'mipsisa64el')) {
|
|
||||||
- $extra_args = "-static -Wl,--section-start=.MIPS.options=$ala";
|
|
||||||
-} else {
|
|
||||||
- $extra_args = "-static -Wl,@FLAG_T_TEXT@=$ala";
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-my $cmd = join(" ", @ARGV, $extra_args);
|
|
||||||
+my $cmd = join(" ", @ARGV, "-static -Wl,@FLAG_T_TEXT@=$ala");
|
|
||||||
|
|
||||||
#print "link_tool_exe_linux: $cmd\n";
|
|
||||||
|
|
@ -1,3 +0,0 @@ |
|||||||
void abort(void) |
|
||||||
{ |
|
||||||
} |
|
Loading…
Reference in new issue