yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sim: build: switch to libtool for linking

Browse Source 
The top-level already sets up a libtool script for the host, so use
that when linking rather than invoking CC directly.  This will also
happen when we (someday) move the building to pure automake.
This commit is contained in:
Mike Frysinger 2022-11-03 13:11:41 +05:45
parent 231f62da1d
commit 90db43bb03
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sim/arch-subdir.mk.in
View File

@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AM_V = @AM_V@
host_alias = @host_alias@
target_alias = @target_alias@
program_transform_name = @program_transform_name@
@ -42,6 +44,12 @@ AR_FLAGS = rc
RANLIB = @RANLIB@
DTC = @DTC@
LIBTOOL = @LIBTOOL@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
DEPMODE = @CCDEPMODE@
DEPDIR = @DEPDIR@

12
sim/common/Make-common.in
View File

@ -43,6 +43,9 @@ srcsim = $(srcdir)/..
@SIM_COMMON_BUILD_FALSE@config.status = config.status
@SIM_COMMON_BUILD_TRUE@config.status = ../config.status
# Settings from top-level configure.
include ../arch-subdir.mk
include $(srcroot)/gdb/silent-rules.mk
ifeq ($(V),0)
@ -56,9 +59,6 @@ endif
GNULIB_PARENT_DIR = ../..
include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
# Settings from top-level configure.
include ../arch-subdir.mk
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -258,7 +258,8 @@ libsim.a: $(LIB_OBJS)
$(ECHO_RANLIB) $(RANLIB) libsim.a
run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
$(ECHO_CCLD) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o run$(EXEEXT) \
$(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o run$(EXEEXT) \
$(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
#
@ -416,7 +417,8 @@ stamp-hw: Makefile.in $(srccom)/Make-common.in $(config.status) Makefile
$(SILENCE) touch $@
test-hw-events: $(srccom)/hw-events.c libsim.a
$(CC) $(ALL_CFLAGS) -DMAIN -o test-hw-events$(EXEEXT) \
$(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
$(CC) $(ALL_CFLAGS) -DMAIN -o test-hw-events$(EXEEXT) \
$(srccom)/hw-events.c libsim.a $(EXTRA_LIBS)
# See sim_pre_argv_init and sim_module_install in sim-module.c for more details.

3
sim/cris/Makefile.in
View File

@ -53,7 +53,8 @@ all: rvdummy$(EXEEXT)
check: rvdummy$(EXEEXT)
rvdummy$(EXEEXT): rvdummy.o $(EXTRA_LIBDEPS)
$(ECHO_CCLD) $(CC) $(ALL_CFLAGS) -o rvdummy$(EXEEXT) rvdummy.o $(EXTRA_LIBS)
$(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
$(CC) $(ALL_CFLAGS) -o rvdummy$(EXEEXT) rvdummy.o $(EXTRA_LIBS)
rvdummy.o: rvdummy.c $(remote_sim_h) $(callback_h)

3
sim/ppc/Makefile.in
View File

@ -522,7 +522,8 @@ PACKAGE_OBJ = @sim_pk_obj@
psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
$(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
$(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
$(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
run$(EXEEXT): psim$(EXEEXT)
$(SILENCE) rm -f $@