* [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0
@ 2016-10-25 21:29 Peter Seiderer
2016-10-26 11:18 ` Vicente Olivert Riera
2016-10-26 20:47 ` Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Peter Seiderer @ 2016-10-25 21:29 UTC (permalink / raw)
To: buildroot
See [1] for release notes.
- removed 0003-mips-replace-addi-with-addiu.patch (applied upstream, see [2])
[1] http://valgrind.org/docs/manual/dist.news.html
[2] https://bugs.kde.org/show_bug.cgi?id=356112
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Patch 0003-mips-replace-addi-with-addiu.patch is only applied partly upstream,
the '#ifdef' parts are missing.
@Vicente: Should I re-add the upstream missing parts of the removed
patch?
---
.../0003-mips-replace-addi-with-addiu.patch | 137 ---------------------
package/valgrind/valgrind.hash | 2 +-
package/valgrind/valgrind.mk | 2 +-
3 files changed, 2 insertions(+), 139 deletions(-)
delete mode 100644 package/valgrind/0003-mips-replace-addi-with-addiu.patch
diff --git a/package/valgrind/0003-mips-replace-addi-with-addiu.patch b/package/valgrind/0003-mips-replace-addi-with-addiu.patch
deleted file mode 100644
index 624f6fa..0000000
--- a/package/valgrind/0003-mips-replace-addi-with-addiu.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-mips: replace addi with addiu
-
-ADDI instruction has been removed in R6 so let's use ADDIU instead.
-
-This patch has been sent upstream:
-
- https://bugs.kde.org/show_bug.cgi?id=356112
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-Index: valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S
-===================================================================
---- valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (revision 15740)
-+++ valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (working copy)
-@@ -196,7 +196,7 @@
- addu $13, $13, $14
-
- lw $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
-- addi $13, $13, 4
-+ addiu $13, $13, 4
- lw $25, 0($13) /* little-endian, so comparing 1st 32bit word */
- nop
-
-Index: valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S
-===================================================================
---- valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (revision 15740)
-+++ valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (working copy)
-@@ -196,7 +196,7 @@
- daddu $13, $13, $14
-
- ld $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
-- daddi $13, $13, 8
-+ daddiu $13, $13, 8
- ld $25, 0($13) /* little-endian, so comparing 1st 32bit word */
- nop
-
-Index: valgrind/coregrind/m_libcsetjmp.c
-===================================================================
---- valgrind/coregrind/m_libcsetjmp.c (revision 15740)
-+++ valgrind/coregrind/m_libcsetjmp.c (working copy)
-@@ -594,7 +594,7 @@
- /* Checking whether second argument is zero. */
- " bnez $a1, 1f \n\t"
- " nop \n\t"
--" addi $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
-+" addiu $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
- "1: \n\t"
- " move $v0, $a1 \n\t" /* Return value of second argument. */
- " j $ra \n\t"
-Index: valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c
-===================================================================
---- valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (revision 15740)
-+++ valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (working copy)
-@@ -173,7 +173,7 @@
- " ld $30, 8($29)\n"
- " ld $28, 16($29)\n"
- " jr $31\n"
--" daddi $29,$29, 32\n"
-+" daddiu $29,$29, 32\n"
- ".previous\n"
- );
-
-Index: valgrind/coregrind/m_trampoline.S
-===================================================================
---- valgrind/coregrind/m_trampoline.S (revision 15740)
-+++ valgrind/coregrind/m_trampoline.S (working copy)
-@@ -1254,8 +1254,8 @@
- //la $a0, string
- j strlen_cond
- strlen_loop:
-- addi $v0, $v0, 1
-- addi $a0, $a0, 1
-+ addiu $v0, $v0, 1
-+ addiu $a0, $a0, 1
- strlen_cond:
- lbu $t0, ($a0)
- bne $t0, $zero, strlen_loop
-Index: valgrind/helgrind/tests/tc08_hbl2.c
-===================================================================
---- valgrind/helgrind/tests/tc08_hbl2.c (revision 15740)
-+++ valgrind/helgrind/tests/tc08_hbl2.c (working copy)
-@@ -125,11 +125,11 @@
- # define INC(_lval,_lqual) \
- __asm__ __volatile__ ( \
- "L1xyzzy1" _lqual":\n" \
-- " move $t0, %0\n" \
-- " ll $t1, 0($t0)\n" \
-- " addi $t1, $t1, 1\n" \
-- " sc $t1, 0($t0)\n" \
-- " beqz $t1, L1xyzzy1" _lqual \
-+ " move $t0, %0\n" \
-+ " ll $t1, 0($t0)\n" \
-+ " addiu $t1, $t1, 1\n" \
-+ " sc $t1, 0($t0)\n" \
-+ " beqz $t1, L1xyzzy1" _lqual \
- : /*out*/ : /*in*/ "r"(&(_lval)) \
- : /*trash*/ "t0", "t1", "memory" \
- )
-Index: valgrind/VEX/priv/guest_mips_toIR.c
-===================================================================
---- valgrind/VEX/priv/guest_mips_toIR.c (revision 3206)
-+++ valgrind/VEX/priv/guest_mips_toIR.c (working copy)
-@@ -16794,6 +16794,7 @@
- mkU64(0x0) : mkU32(0x0)))), imm);
- break;
-
-+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6))
- case 0x08: { /* ADDI */
- DIP("addi r%u, r%u, %u", rt, rs, imm);
- IRTemp tmpRs32 = newTemp(Ity_I32);
-@@ -16831,6 +16832,8 @@
- putIReg(rt, mkWidenFrom32(ty, mkexpr(t0), True));
- break;
- }
-+#endif
-+
- case 0x09: /* ADDIU */
- DIP("addiu r%u, r%u, %u", rt, rs, imm);
- if (mode64) {
-@@ -16888,7 +16891,8 @@
- mkU32(extend_s_16to32(imm)))));
- break;
-
-- case 0x18: { /* Doubleword Add Immidiate - DADD; MIPS64 */
-+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6))
-+ case 0x18: { /* Doubleword Add Immidiate - DADDI; MIPS64 */
- DIP("daddi r%u, r%u, %u", rt, rs, imm);
- IRTemp tmpRs64 = newTemp(Ity_I64);
- assign(tmpRs64, getIReg(rs));
-@@ -16926,6 +16930,7 @@
- putIReg(rt, mkexpr(t0));
- break;
- }
-+#endif
-
- case 0x19: /* Doubleword Add Immidiate Unsigned - DADDIU; MIPS64 */
- DIP("daddiu r%u, r%u, %u", rt, rs, imm);
diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash
index f2cd6e8..5d7da19 100644
--- a/package/valgrind/valgrind.hash
+++ b/package/valgrind/valgrind.hash
@@ -1,2 +1,2 @@
# From http://valgrind.org/downloads/current.html
-md5 4ea62074da73ae82e0162d6550d3f129 valgrind-3.11.0.tar.bz2
+md5 6eb03c0c10ea917013a7622e483d61bb valgrind-3.12.0.tar.bz2
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index b97d446..09f7116 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,7 +4,7 @@
#
################################################################################
-VALGRIND_VERSION = 3.11.0
+VALGRIND_VERSION = 3.12.0
VALGRIND_SITE = http://valgrind.org/downloads
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
VALGRIND_LICENSE = GPLv2 GFDLv1.2
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0
2016-10-25 21:29 [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0 Peter Seiderer
@ 2016-10-26 11:18 ` Vicente Olivert Riera
2016-10-26 20:48 ` Thomas Petazzoni
2016-10-26 20:47 ` Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Vicente Olivert Riera @ 2016-10-26 11:18 UTC (permalink / raw)
To: buildroot
Hello Peter,
On 25/10/16 22:29, Peter Seiderer wrote:
> See [1] for release notes.
>
> - removed 0003-mips-replace-addi-with-addiu.patch (applied upstream, see [2])
>
> [1] http://valgrind.org/docs/manual/dist.news.html
> [2] https://bugs.kde.org/show_bug.cgi?id=356112
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Patch 0003-mips-replace-addi-with-addiu.patch is only applied partly upstream,
> the '#ifdef' parts are missing.
>
> @Vicente: Should I re-add the upstream missing parts of the removed
> patch?
I have done a build test and it didn't fail, so it looks like those
upstream missing parts are not needed.
Regards,
Vincent.
> ---
> .../0003-mips-replace-addi-with-addiu.patch | 137 ---------------------
> package/valgrind/valgrind.hash | 2 +-
> package/valgrind/valgrind.mk | 2 +-
> 3 files changed, 2 insertions(+), 139 deletions(-)
> delete mode 100644 package/valgrind/0003-mips-replace-addi-with-addiu.patch
>
> diff --git a/package/valgrind/0003-mips-replace-addi-with-addiu.patch b/package/valgrind/0003-mips-replace-addi-with-addiu.patch
> deleted file mode 100644
> index 624f6fa..0000000
> --- a/package/valgrind/0003-mips-replace-addi-with-addiu.patch
> +++ /dev/null
> @@ -1,137 +0,0 @@
> -mips: replace addi with addiu
> -
> -ADDI instruction has been removed in R6 so let's use ADDIU instead.
> -
> -This patch has been sent upstream:
> -
> - https://bugs.kde.org/show_bug.cgi?id=356112
> -
> -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> -
> -Index: valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S
> -===================================================================
> ---- valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (revision 15740)
> -+++ valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (working copy)
> -@@ -196,7 +196,7 @@
> - addu $13, $13, $14
> -
> - lw $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
> -- addi $13, $13, 4
> -+ addiu $13, $13, 4
> - lw $25, 0($13) /* little-endian, so comparing 1st 32bit word */
> - nop
> -
> -Index: valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S
> -===================================================================
> ---- valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (revision 15740)
> -+++ valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (working copy)
> -@@ -196,7 +196,7 @@
> - daddu $13, $13, $14
> -
> - ld $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
> -- daddi $13, $13, 8
> -+ daddiu $13, $13, 8
> - ld $25, 0($13) /* little-endian, so comparing 1st 32bit word */
> - nop
> -
> -Index: valgrind/coregrind/m_libcsetjmp.c
> -===================================================================
> ---- valgrind/coregrind/m_libcsetjmp.c (revision 15740)
> -+++ valgrind/coregrind/m_libcsetjmp.c (working copy)
> -@@ -594,7 +594,7 @@
> - /* Checking whether second argument is zero. */
> - " bnez $a1, 1f \n\t"
> - " nop \n\t"
> --" addi $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
> -+" addiu $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
> - "1: \n\t"
> - " move $v0, $a1 \n\t" /* Return value of second argument. */
> - " j $ra \n\t"
> -Index: valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c
> -===================================================================
> ---- valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (revision 15740)
> -+++ valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (working copy)
> -@@ -173,7 +173,7 @@
> - " ld $30, 8($29)\n"
> - " ld $28, 16($29)\n"
> - " jr $31\n"
> --" daddi $29,$29, 32\n"
> -+" daddiu $29,$29, 32\n"
> - ".previous\n"
> - );
> -
> -Index: valgrind/coregrind/m_trampoline.S
> -===================================================================
> ---- valgrind/coregrind/m_trampoline.S (revision 15740)
> -+++ valgrind/coregrind/m_trampoline.S (working copy)
> -@@ -1254,8 +1254,8 @@
> - //la $a0, string
> - j strlen_cond
> - strlen_loop:
> -- addi $v0, $v0, 1
> -- addi $a0, $a0, 1
> -+ addiu $v0, $v0, 1
> -+ addiu $a0, $a0, 1
> - strlen_cond:
> - lbu $t0, ($a0)
> - bne $t0, $zero, strlen_loop
> -Index: valgrind/helgrind/tests/tc08_hbl2.c
> -===================================================================
> ---- valgrind/helgrind/tests/tc08_hbl2.c (revision 15740)
> -+++ valgrind/helgrind/tests/tc08_hbl2.c (working copy)
> -@@ -125,11 +125,11 @@
> - # define INC(_lval,_lqual) \
> - __asm__ __volatile__ ( \
> - "L1xyzzy1" _lqual":\n" \
> -- " move $t0, %0\n" \
> -- " ll $t1, 0($t0)\n" \
> -- " addi $t1, $t1, 1\n" \
> -- " sc $t1, 0($t0)\n" \
> -- " beqz $t1, L1xyzzy1" _lqual \
> -+ " move $t0, %0\n" \
> -+ " ll $t1, 0($t0)\n" \
> -+ " addiu $t1, $t1, 1\n" \
> -+ " sc $t1, 0($t0)\n" \
> -+ " beqz $t1, L1xyzzy1" _lqual \
> - : /*out*/ : /*in*/ "r"(&(_lval)) \
> - : /*trash*/ "t0", "t1", "memory" \
> - )
> -Index: valgrind/VEX/priv/guest_mips_toIR.c
> -===================================================================
> ---- valgrind/VEX/priv/guest_mips_toIR.c (revision 3206)
> -+++ valgrind/VEX/priv/guest_mips_toIR.c (working copy)
> -@@ -16794,6 +16794,7 @@
> - mkU64(0x0) : mkU32(0x0)))), imm);
> - break;
> -
> -+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6))
> - case 0x08: { /* ADDI */
> - DIP("addi r%u, r%u, %u", rt, rs, imm);
> - IRTemp tmpRs32 = newTemp(Ity_I32);
> -@@ -16831,6 +16832,8 @@
> - putIReg(rt, mkWidenFrom32(ty, mkexpr(t0), True));
> - break;
> - }
> -+#endif
> -+
> - case 0x09: /* ADDIU */
> - DIP("addiu r%u, r%u, %u", rt, rs, imm);
> - if (mode64) {
> -@@ -16888,7 +16891,8 @@
> - mkU32(extend_s_16to32(imm)))));
> - break;
> -
> -- case 0x18: { /* Doubleword Add Immidiate - DADD; MIPS64 */
> -+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6))
> -+ case 0x18: { /* Doubleword Add Immidiate - DADDI; MIPS64 */
> - DIP("daddi r%u, r%u, %u", rt, rs, imm);
> - IRTemp tmpRs64 = newTemp(Ity_I64);
> - assign(tmpRs64, getIReg(rs));
> -@@ -16926,6 +16930,7 @@
> - putIReg(rt, mkexpr(t0));
> - break;
> - }
> -+#endif
> -
> - case 0x19: /* Doubleword Add Immidiate Unsigned - DADDIU; MIPS64 */
> - DIP("daddiu r%u, r%u, %u", rt, rs, imm);
> diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash
> index f2cd6e8..5d7da19 100644
> --- a/package/valgrind/valgrind.hash
> +++ b/package/valgrind/valgrind.hash
> @@ -1,2 +1,2 @@
> # From http://valgrind.org/downloads/current.html
> -md5 4ea62074da73ae82e0162d6550d3f129 valgrind-3.11.0.tar.bz2
> +md5 6eb03c0c10ea917013a7622e483d61bb valgrind-3.12.0.tar.bz2
> diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
> index b97d446..09f7116 100644
> --- a/package/valgrind/valgrind.mk
> +++ b/package/valgrind/valgrind.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -VALGRIND_VERSION = 3.11.0
> +VALGRIND_VERSION = 3.12.0
> VALGRIND_SITE = http://valgrind.org/downloads
> VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
> VALGRIND_LICENSE = GPLv2 GFDLv1.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0
2016-10-25 21:29 [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0 Peter Seiderer
2016-10-26 11:18 ` Vicente Olivert Riera
@ 2016-10-26 20:47 ` Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-10-26 20:47 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 25 Oct 2016 23:29:46 +0200, Peter Seiderer wrote:
> See [1] for release notes.
>
> - removed 0003-mips-replace-addi-with-addiu.patch (applied upstream, see [2])
>
> [1] http://valgrind.org/docs/manual/dist.news.html
> [2] https://bugs.kde.org/show_bug.cgi?id=356112
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Patch 0003-mips-replace-addi-with-addiu.patch is only applied partly upstream,
> the '#ifdef' parts are missing.
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0
2016-10-26 11:18 ` Vicente Olivert Riera
@ 2016-10-26 20:48 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-10-26 20:48 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 26 Oct 2016 12:18:04 +0100, Vicente Olivert Riera wrote:
> I have done a build test and it didn't fail, so it looks like those
> upstream missing parts are not needed.
Thanks for testing. In such a case, please reply with a formal
Tested-by, so that patchwork catches it and I notice that the patch has
at least been looked at by one person.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-26 20:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-25 21:29 [Buildroot] [PATCH v1] valgrind: bump version to 3.12.0 Peter Seiderer
2016-10-26 11:18 ` Vicente Olivert Riera
2016-10-26 20:48 ` Thomas Petazzoni
2016-10-26 20:47 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox