From a7bd4685fe3927f6a043ce2c779769e25649b072 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 11 Apr 2025 15:53:05 +0200
Subject: frv: fix compile issues

---
 Rules.mak              | 3 +++
 ldso/ldso/dl-elf.c     | 2 +-
 ldso/ldso/dl-startup.c | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index 309ebcbff..1aa1be93a 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -671,6 +671,9 @@ endif
 ifeq ($(TARGET_ARCH),bfin)
 CFLAGS += -Wno-implicit-function-declaration
 endif
+ifeq ($(TARGET_ARCH),frv)
+CFLAGS += -Wno-implicit-function-declaration
+endif
 ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"")
 LDFLAGS += $(call qstrip,$(UCLIBC_EXTRA_LDFLAGS))
 endif
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 4f50d62b7..6656acb0f 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -1028,7 +1028,7 @@ int _dl_fixup(struct dyn_elf *rpnt, struct r_scope_elem *scope, int now_flag)
 		return goof;
 	}
 
-#if !defined(__FDPIC__) && !defined(__DSBT__)
+#if !defined(__FDPIC__) && !defined(__FRV_FDPIC__) && !defined(__DSBT__)
 	/* Process DT_RELR relative relocations */
 	DL_RELOCATE_RELR(tpnt);
 #endif
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index e0d8c8fff..ec6b72a39 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -267,7 +267,7 @@ DL_START(unsigned long args)
 	   that once we are done, we have considerably more flexibility. */
 	SEND_EARLY_STDERR_DEBUG("About to do library loader relocations\n");
 
-#if !defined(__FDPIC__) && !defined(__DSBT__)
+#if !defined(__FDPIC__) && !defined(__FRV_FDPIC__) && !defined(__DSBT__)
 	/* Process DT_RELR relative relocations */
 	DL_RELOCATE_RELR(tpnt);
 #endif
-- 
cgit v1.2.3