From 8e25beb4af30830149248c33771452354c48a8b7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 17 Jan 2021 14:41:35 -0500
Subject: [PATCH] sim: igen: drop libiberty linkage

This dir doesn't use anything from libiberty, so drop the linkage.
---
 sim/igen/Makefile.in  | 4 +---
 sim/igen/configure    | 4 ----
 sim/igen/configure.ac | 3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/sim/igen/Makefile.in b/sim/igen/Makefile.in
index 2949df73a2d..6e3f9289019 100644
--- a/sim/igen/Makefile.in
+++ b/sim/igen/Makefile.in
@@ -81,8 +81,6 @@ MAKEOVERRIDES=
 LIB_INCLUDES	= -I$(srcdir)/../../include
 INCLUDES	= -I. -I$(srcdir) $(LIB_INCLUDES)
 
-LIBIBERTY_LIB	= @LIBIBERTY_LIB@
-
 BUILD_CFLAGS = \
 	$(CFLAGS_FOR_BUILD) \
 	$(IGEN_WARN_CFLAGS) \
@@ -117,7 +115,7 @@ IGEN_OBJS=\
 	gen.o
 
 igen: igen.o $(IGEN_OBJS)
-	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o igen igen.o $(IGEN_OBJS) $(LIBIBERTY_LIB)
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o igen igen.o $(IGEN_OBJS)
 
 igen.o: igen.c misc.h filter_host.h lf.h table.h ld-decode.h ld-cache.h ld-insn.h filter.h gen-model.h gen-itable.h gen-icache.h gen-idecode.h gen-engine.h gen-semantics.h gen-support.h gen.h igen.h 
 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/igen.c
diff --git a/sim/igen/configure b/sim/igen/configure
index 195df5c9a6d..46621b7b40c 100755
--- a/sim/igen/configure
+++ b/sim/igen/configure
@@ -623,7 +623,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 RANLIB
 AR
-LIBIBERTY_LIB
 RANLIB_FOR_BUILD
 CFLAGS_FOR_BUILD
 CC_FOR_BUILD
@@ -4890,14 +4889,12 @@ if test "x$cross_compiling" = "xno" -a "x$host" != "xi386-windows"; then
   CC_FOR_BUILD='$(CC)'
   CFLAGS_FOR_BUILD='$(CFLAGS)'
   RANLIB_FOR_BUILD='$(RANLIB)'
-  LIBIBERTY_LIB=../../libiberty/libiberty.a
 else
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AR_FLAGS_FOR_BUILD=${AR_FLAGS_FOR_BUILD-rc}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"-g"}
   RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
-  LIBIBERTY_LIB=
 fi
 
 
@@ -5604,7 +5601,6 @@ fi
 
 
 
-
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
diff --git a/sim/igen/configure.ac b/sim/igen/configure.ac
index 7217bd4a99e..06ae3eb0a54 100644
--- a/sim/igen/configure.ac
+++ b/sim/igen/configure.ac
@@ -14,14 +14,12 @@ if test "x$cross_compiling" = "xno" -a "x$host" != "xi386-windows"; then
   CC_FOR_BUILD='$(CC)'
   CFLAGS_FOR_BUILD='$(CFLAGS)'
   RANLIB_FOR_BUILD='$(RANLIB)'
-  LIBIBERTY_LIB=../../libiberty/libiberty.a
 else
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AR_FLAGS_FOR_BUILD=${AR_FLAGS_FOR_BUILD-rc}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"-g"}
   RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
-  LIBIBERTY_LIB=
 fi
 
 
@@ -39,7 +37,6 @@ AC_SUBST(AR_FLAGS_FOR_BUILD)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CFLAGS_FOR_BUILD)
 AC_SUBST(RANLIB_FOR_BUILD)
-AC_SUBST(LIBIBERTY_LIB)
 
 AC_SUBST(AR)
 AC_SUBST(CFLAGS)
-- 
2.30.2