diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-07-06 23:44:38 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-10-31 04:51:44 -0400 |
| commit | cd3ee89d386d37b5b4db34427f5e1dd9e0f63ad2 (patch) | |
| tree | 1de248b41fd92614b0df41e098728f0bc02586fa /sim/common | |
| parent | 670817b94710b751f032d5b89a3026428ce9c397 (diff) | |
sim: unify callback.o building
Now that the use of TARGET_xxx defines have been removed, we can move
this to the common logic so we only build it once for multi-targets.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/Make-common.in | 3 | ||||
| -rw-r--r-- | sim/common/local.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index e5c3484c04..4c83059176 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -229,6 +229,7 @@ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ + callback.o \ portability.o \ sim-load.o \ target-newlib-errno.o \ @@ -237,7 +238,7 @@ COMMON_OBJS_NAMES = \ version.o COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%) -LIB_OBJS = callback.o modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS) +LIB_OBJS = modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ diff --git a/sim/common/local.mk b/sim/common/local.mk index fdbdca444b..2fd78264ba 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -34,6 +34,7 @@ noinst_LIBRARIES += %D%/libcommon.a -I../bfd \ -I.. %C%_libcommon_a_SOURCES = \ + %D%/callback.c \ %D%/portability.c \ %D%/sim-load.c \ %D%/target-newlib-errno.c \ |