From 69769ff44ed0572a7b3c769ce3c36f28fff359d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jun 2024 22:26:34 -0700 Subject: rdma-core: Fix recvfrom override errors with glibc 2.40 and clang Signed-off-by: Khem Raj --- ...se-overloadable-function-attribute-with-c.patch | 40 ++++++++++++++++++++++ .../recipes-support/rdma-core/rdma-core_51.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch new file mode 100644 index 0000000000..9cd240189e --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch @@ -0,0 +1,40 @@ +From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 21 Jun 2024 22:16:47 -0700 +Subject: [PATCH] librdmacm: Use overloadable function attribute with clang + + This is to fix build warnings seen with upcoming clang19 and + glibc 2.40, since glibc 2.40 has improved fortyfying this + function with clang, it ends up with build errors like below + +librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute +| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here +| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, +| | ^ + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] +Signed-off-by: Khem Raj +--- + librdmacm/preload.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/librdmacm/preload.c b/librdmacm/preload.c +index d46beb1bb..e09b2aa85 100644 +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size_t len, int flags) + return (fd_fork_get(socket, &fd) == fd_rsocket) ? + 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 ++#ifdef __clang__ ++__attribute__((overloadable)) ++#endif ++recvfrom(int socket, void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) + { + int fd; diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb index 7c26a8c436..0c204c109f 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb @@ -8,6 +8,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ " SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf