sim: rename BUILD_LDFLAGS to LDFLAGS_FOR_BUILD

The rest of the binutils tree renamed this variable many years ago.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 8d48933c8351f43d761e01d7389f19b859c84b1d..1676df734566886197022e013ea8f2ab66624522 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (LINK_FOR_BUILD): Change BUILD_LDFLAGS to
+       LDFLAGS_FOR_BUILD.
+
 2021-03-13  Mike Frysinger  <vapier@gentoo.org>
 
        * 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 8b35deb5167955f89a99083e21515f254f985f03..f4a7e8da11debb1058fabef82762a6ee497ea9a3 100644 (file)
--- 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 5ee1c7a66b790d176fd2e3b466c06eb74e9b39f2..a374d5e9916caf3f432ed845a9e1dc78b90433cb 100644 (file)
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@@ -1,3 +1,11 @@
+2021-03-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define.

diff --git a/sim/igen/Makefile.in b/sim/igen/Makefile.in
index 60626adafc317f351c68bf247144d11880bf6335..3c06c724ee8101dae8e3bc907ce5d5c2e14c3da7 100644 (file)
--- 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 074e0dd0005382adec91be5274a72a717afbfc00..527b54f9dec6f732a6a5a1ca019e924255a3d5a0 100755 (executable)
--- 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 807e1d5969390e141bf60fc7c7d373be31ffc0f8..d87673e905639507ec78d9a67a8113a035c35199 100644 (file)
--- 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 61bb3d95a231246479801a5b6fae955c9a358f66..16b3ab78cb10875a88457516582f9f838ce059e9 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 8c586350b9dcf8baae53847341bc089170b9ec12..ae99dc3a103847fc6d3a36eb4bbc35cb92d21e67 100644 (file)
--- 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@