From 33383d1674cdd18503cbdfc3678ec9764d7846fa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 17:46:15 -0500 Subject: [PATCH] sim: build: drop unused SIM_EXTRA_LIBS Now that all run binaries are linked in the topdir, this subdir libs variable isn't used anywhere, so punt it. --- sim/README-HACKING | 2 -- sim/common/Make-common.in | 4 +--- sim/erc32/Makefile.in | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sim/README-HACKING b/sim/README-HACKING index d2b2786ee71..c47eef8ce73 100644 --- a/sim/README-HACKING +++ b/sim/README-HACKING @@ -51,8 +51,6 @@ SIM_OBJS = SIM_EXTRA_DEPS = # List of flags to always pass to $(CC). SIM_EXTRA_CFLAGS = -# List of extra libraries to link with. -SIM_EXTRA_LIBS = # Dependency of `clean' to clean any extra files. SIM_EXTRA_CLEAN = diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ff31f33c327..8d9585287c7 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -90,8 +90,6 @@ SIM_OBJS = SIM_EXTRA_DEPS = # List of flags to always pass to $(CC). SIM_EXTRA_CFLAGS = -# List of extra libraries to link with. -SIM_EXTRA_LIBS = # List of main object files for `run'. SIM_RUN_OBJS = nrun.o # Dependency of `clean' to clean any extra files. @@ -136,7 +134,7 @@ BFD_LIB = ../../bfd/libbfd.la OPCODES_LIB = ../../opcodes/libopcodes.la LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) \ - $(COMMON_LIBS) $(SIM_EXTRA_LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) + $(COMMON_LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ callback.o \ diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index b6c48d6d3f6..d10eb0eb1a4 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -23,7 +23,6 @@ READLINE_SRC = $(srcroot)/readline/readline SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o SIM_RUN_OBJS = sis.o SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS) -SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to # CFLAGS if faster (infinite) UART speed is desired. Might affect the -- 2.30.2