mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

valgrind: tests build fixes for musl

Browse Source 
x86/aarch64 needed minor changes to make few testcases portable

(From OE-Core rev: 459907cd548b97e50b26036e6898d32685cee01e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2017-07-05 17:50:31 -07:00
committed by Richard Purdie
parent 155cff6c9e
commit 23df57b150
4 changed files with 135 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch Normal file
View File

@@ -0,0 +1,32 @@
From 3409dc35c15bb14c8a525239806322648e079ab1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Jul 2017 17:12:43 -0700
Subject: [PATCH 1/3] memcheck/arm64: Define __THROW if not already defined
Helps compiling with musl where __THROW is not available
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
memcheck/tests/arm64-linux/scalar.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h
index 9008816..8ef050f 100644
--- a/memcheck/tests/arm64-linux/scalar.h
+++ b/memcheck/tests/arm64-linux/scalar.h
@@ -12,6 +12,10 @@
#include <sys/types.h>
#include <sys/mman.h>
+#ifndef __THROW
+#define __THROW
+#endif
+
// Since we use vki_unistd.h, we can't include <unistd.h>. So we have to
// declare this ourselves.
extern long int syscall (long int __sysno, ...) __THROW;
--
2.13.2

32
meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch Normal file
View File

@@ -0,0 +1,32 @@
From 67d199dbdcbb3feff5f8928f87725fc64c0307d7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Jul 2017 17:36:42 -0700
Subject: [PATCH 2/3] memcheck/x86: Define __THROW if not defined
musl does not have __THROW, therefore make it null
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
memcheck/tests/x86-linux/scalar.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h
index ef28b03..52f742e 100644
--- a/memcheck/tests/x86-linux/scalar.h
+++ b/memcheck/tests/x86-linux/scalar.h
@@ -11,6 +11,10 @@
#include <sys/types.h>
#include <sys/mman.h>
+#ifndef __THROW
+#define __THROW
+#endif
+
// Since we use vki_unistd.h, we can't include <unistd.h>. So we have to
// declare this ourselves.
extern long int syscall (long int __sysno, ...) __THROW;
--
2.13.2

68
meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch Normal file
View File

@@ -0,0 +1,68 @@
From d103475875858ab8a2e6b53ce178bb2f63883d4c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Jul 2017 17:37:56 -0700
Subject: [PATCH 3/3] tests/seg_override: Replace __modify_ldt() with syscall()
__modify_ldt() is specific to glibc, replacing it with syscall()
makes it more portable.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
none/tests/x86-linux/seg_override.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c
index b7619c9..c89874b 100644
--- a/none/tests/x86-linux/seg_override.c
+++ b/none/tests/x86-linux/seg_override.c
@@ -2,6 +2,8 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
+#include <syscall.h>
/* Stuff from Wine. */
@@ -52,14 +54,11 @@ inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent )
/* our copy of the ldt */
LDT_ENTRY ldt_copy[8192];
-/* System call to set LDT entry. */
-//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
-extern int __modify_ldt (int, void *, size_t);
-
void print_ldt ( void )
{
int res;
- res = __modify_ldt( 0, ldt_copy, 8192*sizeof(LDT_ENTRY) );
+ /* System call to set LDT entry. */
+ res = syscall(SYS_modify_ldt, 0, ldt_copy, 8192*sizeof(LDT_ENTRY) );
printf("got %d bytes\n", res );
perror("error is");
}
@@ -83,9 +82,6 @@ struct modify_ldt_ldt_s
unsigned int empty:25;
};
-/* System call to set LDT entry. */
-//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
-
void set_ldt1 ( void* base )
{
int stat;
@@ -102,7 +98,8 @@ void set_ldt1 ( void* base )
ldt_entry.read_exec_only = 0;
ldt_entry.limit_in_pages = 0;
ldt_entry.seg_not_present = 0;
- stat = __modify_ldt (1, &ldt_entry, sizeof (ldt_entry));
+ /* System call to set LDT entry. */
+ stat = syscall(SYS_modify_ldt, 1, &ldt_entry, sizeof (ldt_entry));
printf("stat = %d\n", stat);
}
--
2.13.2

3
meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
View File

@@ -32,6 +32,9 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \
file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \
file://0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch \
file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \
file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \
file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \
"
SRC_URI_append_libc-musl = "\
file://0001-fix-build-for-musl-targets.patch \