aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-08-19 13:02:52 -0700
committerKhem Raj <raj.khem@gmail.com>2021-08-19 13:02:52 -0700
commitda5c9b3c3c7e66c52ea2f79343e6009ff410f2ca (patch)
tree83aeaa9cb19b1d7bb801224edb85442035f5efed
parentcddadde93363f7f1f46f6f8aff8890dab1273ed1 (diff)
downloadopenembedded-core-contrib-da5c9b3c3c7e66c52ea2f79343e6009ff410f2ca.tar.gz
openembedded-core-contrib-da5c9b3c3c7e66c52ea2f79343e6009ff410f2ca.tar.bz2
openembedded-core-contrib-da5c9b3c3c7e66c52ea2f79343e6009ff410f2ca.zip
pseudo: Fix for riscv
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-devtools/pseudo/files/glibc234.patch29
1 files changed, 15 insertions, 14 deletions
diff --git a/meta/recipes-devtools/pseudo/files/glibc234.patch b/meta/recipes-devtools/pseudo/files/glibc234.patch
index 86fad5a3def..9cc7c22d0c5 100644
--- a/meta/recipes-devtools/pseudo/files/glibc234.patch
+++ b/meta/recipes-devtools/pseudo/files/glibc234.patch
@@ -8,10 +8,8 @@ specific.
Upstream-Status: Pending
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Index: git/pseudo_util.c
-===================================================================
---- git.orig/pseudo_util.c
-+++ git/pseudo_util.c
+--- a/pseudo_util.c
++++ b/pseudo_util.c
@@ -28,6 +28,11 @@
#include "pseudo.h"
#include "pseudo_ipc.h"
@@ -24,10 +22,8 @@ Index: git/pseudo_util.c
struct pseudo_variables {
char *key;
-Index: git/pseudo_wrappers.c
-===================================================================
---- git.orig/pseudo_wrappers.c
-+++ git/pseudo_wrappers.c
+--- a/pseudo_wrappers.c
++++ b/pseudo_wrappers.c
@@ -28,6 +28,7 @@
/* include this to get PSEUDO_PORT_* definitions */
@@ -49,11 +45,9 @@ Index: git/pseudo_wrappers.c
static void
pseudo_init_one_wrapper(pseudo_function *func) {
int (*f)(void) = (int (*)(void)) NULL;
-Index: git/pseudo_dlsymvers.h
-===================================================================
--- /dev/null
-+++ git/pseudo_dlsymvers.h
-@@ -0,0 +1,30 @@
++++ b/pseudo_dlsymvers.h
+@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 Richard Purdie
+ *
@@ -65,7 +59,7 @@ Index: git/pseudo_dlsymvers.h
+ merged into libc.so in glibc 2.34 onwards since libpseudo needs to link/work
+ with newer libcs and bianries compiles with older ones */
+
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__)
+#if defined(__aarch64__)
+#define DLSYMVER "2.17"
+#define DLVSYMVER "2.17"
@@ -78,9 +72,16 @@ Index: git/pseudo_dlsymvers.h
+#elif defined(__mips__)
+#define DLSYMVER "2.0"
+#define DLVSYMVER "2.2"
++#elif defined(__riscv)
++#if __riscv_xlen == 32
++#define DLSYMVER "2.33"
++#define DLVSYMVER "2.33"
++#elif __riscv_xlen == 64
++#define DLSYMVER "2.27"
++#define DLVSYMVER "2.27"
++#endif
+#else
+#define DLSYMVER "2.0"
+#define DLVSYMVER "2.1"
+#endif
+#endif
-+