sim: common: drop libcommon.a linkage

All of these objects should be in libsim.a already, so don't link to
it too.  In practice it never gets used, but no point in listing it.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index adcd3c6dd6a110a26df669aa6613ab614d9fafc4..204a2c563f19a58ce35947544d3aa8fbf9eefb82 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -427,8 +427,7 @@ am__EXEEXT_8 = testsuite/common/bits32m0$(EXEEXT) \
 PROGRAMS = $(noinst_PROGRAMS)
 am_aarch64_run_OBJECTS =
 aarch64_run_OBJECTS = $(am_aarch64_run_OBJECTS)
-am__DEPENDENCIES_1 = $(SIM_COMMON_LIB) $(BFD_LIB) $(OPCODES_LIB) \
-       $(LIBIBERTY_LIB)
+am__DEPENDENCIES_1 = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB)
 @SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_run_DEPENDENCIES =  \
 @SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/nrun.o aarch64/libsim.a \
 @SIM_ENABLE_ARCH_aarch64_TRUE@ $(am__DEPENDENCIES_1)
@@ -1255,7 +1254,7 @@ AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \
        $(am__append_48) $(am__append_57) $(am__append_62) \
        $(am__append_69) $(am__append_78)
 pkginclude_HEADERS = $(am__append_1)
-noinst_LIBRARIES = $(SIM_COMMON_LIB) $(am__append_5)
+noinst_LIBRARIES = common/libcommon.a $(am__append_5)
 BUILT_SOURCES = $(am__append_14) $(am__append_18) $(am__append_25) \
        $(am__append_29) $(am__append_38) $(am__append_44) \
        $(am__append_49) $(am__append_58) $(am__append_70) \
@@ -1291,7 +1290,6 @@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \
 SIM_INSTALL_DATA_LOCAL_DEPS = 
 SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_34)
 SIM_UNINSTALL_LOCAL_DEPS = $(am__append_35)
-SIM_COMMON_LIB = common/libcommon.a
 common_libcommon_a_SOURCES = \
        common/callback.c \
        common/portability.c \
@@ -1328,7 +1326,6 @@ LIBIBERTY_LIB = ../libiberty/libiberty.a
 BFD_LIB = ../bfd/libbfd.la
 OPCODES_LIB = ../opcodes/libopcodes.la
 SIM_COMMON_LIBS = \
-       $(SIM_COMMON_LIB) \
        $(BFD_LIB) \
        $(OPCODES_LIB) \
        $(LIBIBERTY_LIB) \

diff --git a/sim/common/local.mk b/sim/common/local.mk
index 22917e0f8a6414329851fbb579a4e6d71777c0cf..dd6ed5fec83ca574f67cf7632febb084af7c9651 100644 (file)
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -30,8 +30,7 @@ SIM_ALL_RECURSIVE_DEPS += \
 
 ## NB: libcommon.a isn't used directly by ports.  We need a target for common
 ## objects to be a part of, and ports use the individual objects directly.
-SIM_COMMON_LIB = %D%/libcommon.a
-noinst_LIBRARIES += $(SIM_COMMON_LIB)
+noinst_LIBRARIES += %D%/libcommon.a
 %C%_libcommon_a_SOURCES = \
        %D%/callback.c \
        %D%/portability.c \
@@ -136,7 +135,6 @@ BFD_LIB = ../bfd/libbfd.la
 OPCODES_LIB = ../opcodes/libopcodes.la
 
 SIM_COMMON_LIBS = \
-       $(SIM_COMMON_LIB) \
        $(BFD_LIB) \
        $(OPCODES_LIB) \
        $(LIBIBERTY_LIB) \