From e7d9022ba8755005cae79207b5f911b1a9cebed4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 8 Mar 2021 00:35:03 -0500 Subject: [PATCH] sim: rename BUILD_LDFLAGS to LDFLAGS_FOR_BUILD The rest of the binutils tree renamed this variable many years ago. --- sim/common/ChangeLog | 5 +++++ sim/common/Make-common.in | 2 +- sim/igen/ChangeLog | 8 ++++++++ sim/igen/Makefile.in | 4 ++-- sim/igen/configure | 4 ++++ sim/igen/configure.ac | 3 +++ sim/ppc/ChangeLog | 6 ++++++ sim/ppc/Makefile.in | 4 ++-- 8 files changed, 31 insertions(+), 5 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8d48933c835..1676df73456 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Make-common.in (LINK_FOR_BUILD): Change BUILD_LDFLAGS to + LDFLAGS_FOR_BUILD. + 2021-03-13 Mike Frysinger * Make-common.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 8b35deb5167..f4a7e8da11d 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -249,7 +249,7 @@ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ LIB_OBJS = callback.o syscall.o targ-map.o version.o $(SIM_OBJS) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ RUNTESTFLAGS = diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index 5ee1c7a66b7..a374d5e9916 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -1,3 +1,11 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (LDFLAGS_FOR_BUILD): Define. + (BUILD_LDFLAGS): Delete. + (LINK_FOR_BUILD): Change BUILD_LDFLAGS to LDFLAGS_FOR_BUILD. + * configure.ac (LDFLAGS_FOR_BUILD): Define. + * configure: Regenerate. + 2021-03-13 Mike Frysinger * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. diff --git a/sim/igen/Makefile.in b/sim/igen/Makefile.in index 60626adafc3..3c06c724ee8 100644 --- a/sim/igen/Makefile.in +++ b/sim/igen/Makefile.in @@ -60,6 +60,7 @@ CFLAGS = @CFLAGS@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ WARN_CFLAGS = @WARN_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ @@ -80,10 +81,9 @@ BUILD_CFLAGS = \ $(IGEN_WARN_CFLAGS) \ $(IGEN_WERROR_CFLAGS) \ $(INCLUDES) -BUILD_LDFLAGS = COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(BUILD_LDFLAGS) -o $@ +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ all: igen #all: tmp-filter tmp-table tmp-ld-insn tmp-ld-cache tmp-ld-decode tmp-gen diff --git a/sim/igen/configure b/sim/igen/configure index 074e0dd0005..527b54f9dec 100755 --- a/sim/igen/configure +++ b/sim/igen/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="table.h" ac_subst_vars='LTLIBOBJS LIBOBJS +LDFLAGS_FOR_BUILD CFLAGS_FOR_BUILD CC_FOR_BUILD target_os @@ -2779,9 +2780,11 @@ fi if test "x$cross_compiling" = "xno" -a "x$host" != "xi386-windows"; then CC_FOR_BUILD='$(CC)' CFLAGS_FOR_BUILD='$(CFLAGS)' + LDFLAGS_FOR_BUILD='$(LDFLAGS)' else CC_FOR_BUILD=${CC_FOR_BUILD-gcc} CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"-g"} + LDFLAGS_FOR_BUILD= fi # Make sure we can run config.sub. @@ -2899,6 +2902,7 @@ test -n "$target_alias" && + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/sim/igen/configure.ac b/sim/igen/configure.ac index 807e1d59693..d87673e9056 100644 --- a/sim/igen/configure.ac +++ b/sim/igen/configure.ac @@ -11,14 +11,17 @@ SIM_AC_OPTION_WARNINGS if test "x$cross_compiling" = "xno" -a "x$host" != "xi386-windows"; then CC_FOR_BUILD='$(CC)' CFLAGS_FOR_BUILD='$(CFLAGS)' + LDFLAGS_FOR_BUILD='$(LDFLAGS)' else CC_FOR_BUILD=${CC_FOR_BUILD-gcc} CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"-g"} + LDFLAGS_FOR_BUILD= fi AC_CANONICAL_SYSTEM AC_SUBST(CC_FOR_BUILD) AC_SUBST(CFLAGS_FOR_BUILD) +AC_SUBST(LDFLAGS_FOR_BUILD) AC_OUTPUT(Makefile) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 61bb3d95a23..16b3ab78cb1 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,9 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (BUILD_LDFLAGS): Rename to ... + (LDFLAGS_FOR_BUILD): ... this. + (LINK_FOR_BUILD): Change BUILD_LDFLAGS to LDFLAGS_FOR_BUILD. + 2021-03-13 Mike Frysinger * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 8c586350b9d..ae99dc3a103 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -107,11 +107,11 @@ STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(INC NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) -BUILD_LDFLAGS = +LDFLAGS_FOR_BUILD = LIBS = @LIBS@ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ CONFIG_FILE = @sim_config@ IGEN_OPCODE_RULES = @sim_opcode@ -- 2.30.2