sim: rename BUILD_LDFLAGS to LDFLAGS_FOR_BUILD

The rest of the binutils tree renamed this variable many years ago.
This commit is contained in:
Mike Frysinger 2021-03-08 00:35:03 -05:00
parent c6c7769d9d
commit e7d9022ba8
8 changed files with 31 additions and 5 deletions

View File

@ -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.

View File

@ -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 =

View File

@ -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.

View File

@ -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

4
sim/igen/configure vendored
View File

@ -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

View File

@ -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)

View File

@ -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.

View File

@ -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@