[oe] [meta-networking][PATCH] rdma-core: Drop overloadable attribute for recvfrom

Khem Raj raj.khem at gmail.com
Sat Jan 25 18:48:01 UTC 2020


glibc patch is now removed for this to be required

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...se-overloadable-attribute-with-clang.patch | 42 -------------------
 .../rdma-core/rdma-core_27.0.bb               |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch

diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch
deleted file mode 100644
index 1ba6847d2f..0000000000
--- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 42976ed0a0160864b41680604ea9cdb3c175cb94 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Wed, 15 Jan 2020 17:48:28 -0800
-Subject: [PATCH] Use overloadable attribute with clang
-
-This is overriding the libc implementation
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- librdmacm/preload.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/librdmacm/preload.c b/librdmacm/preload.c
-index d46beb1b..b451de50 100644
---- a/librdmacm/preload.c
-+++ b/librdmacm/preload.c
-@@ -59,6 +59,12 @@
- #include "cma.h"
- #include "indexer.h"
- 
-+#ifdef __clang__
-+#define OVERLOAD  __attribute__((overloadable)) 
-+#else
-+#define OVERLOAD
-+#endif
-+
- struct socket_calls {
- 	int (*socket)(int domain, int type, int protocol);
- 	int (*bind)(int socket, const struct sockaddr *addr, socklen_t addrlen);
-@@ -793,7 +799,7 @@ ssize_t recv(int socket, void *buf, size_t len, int flags)
- 		rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
- }
- 
--ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
-+ssize_t OVERLOAD recvfrom(int socket, void *buf, size_t len, int flags,
- 		 struct sockaddr *src_addr, socklen_t *addrlen)
- {
- 	int fd;
--- 
-2.25.0
-
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb
index 417979dc33..361d69b337 100644
--- a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb
+++ b/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb
@@ -9,7 +9,6 @@ BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}"
 SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \
            file://0001-Remove-man-files-which-cant-be-built.patch \
            file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \
-           file://0001-Use-overloadable-attribute-with-clang.patch \
            "
 SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46"
 S = "${WORKDIR}/git"
-- 
2.25.0



More information about the Openembedded-devel mailing list