aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/aarch64/ChangeLog4
-rw-r--r--sim/aarch64/Makefile.in1
-rw-r--r--sim/arm/ChangeLog4
-rw-r--r--sim/arm/Makefile.in1
-rw-r--r--sim/avr/ChangeLog4
-rw-r--r--sim/avr/Makefile.in1
-rw-r--r--sim/bfin/ChangeLog4
-rw-r--r--sim/bfin/Makefile.in1
-rw-r--r--sim/common/ChangeLog4
-rw-r--r--sim/common/Make-common.in1
-rw-r--r--sim/cr16/ChangeLog4
-rw-r--r--sim/cr16/Makefile.in1
-rw-r--r--sim/cris/ChangeLog4
-rw-r--r--sim/cris/sim-if.c46
-rw-r--r--sim/d10v/ChangeLog4
-rw-r--r--sim/d10v/Makefile.in1
-rw-r--r--sim/frv/ChangeLog4
-rw-r--r--sim/frv/Makefile.in1
-rw-r--r--sim/ft32/ChangeLog4
-rw-r--r--sim/ft32/Makefile.in1
-rw-r--r--sim/iq2000/ChangeLog4
-rw-r--r--sim/iq2000/Makefile.in1
-rw-r--r--sim/lm32/ChangeLog4
-rw-r--r--sim/lm32/Makefile.in1
-rw-r--r--sim/m32r/ChangeLog4
-rw-r--r--sim/m32r/Makefile.in1
-rw-r--r--sim/m68hc11/ChangeLog4
-rw-r--r--sim/m68hc11/Makefile.in1
-rw-r--r--sim/mcore/ChangeLog4
-rw-r--r--sim/mcore/Makefile.in1
-rw-r--r--sim/microblaze/ChangeLog4
-rw-r--r--sim/microblaze/Makefile.in1
-rw-r--r--sim/mips/ChangeLog4
-rw-r--r--sim/mips/Makefile.in1
-rw-r--r--sim/mn10300/ChangeLog4
-rw-r--r--sim/mn10300/Makefile.in1
-rw-r--r--sim/moxie/ChangeLog4
-rw-r--r--sim/moxie/Makefile.in1
-rw-r--r--sim/msp430/ChangeLog4
-rw-r--r--sim/msp430/Makefile.in1
-rw-r--r--sim/sh/ChangeLog4
-rw-r--r--sim/sh/Makefile.in1
-rw-r--r--sim/sh64/ChangeLog4
-rw-r--r--sim/sh64/Makefile.in1
-rw-r--r--sim/v850/ChangeLog4
-rw-r--r--sim/v850/Makefile.in1
46 files changed, 93 insertions, 67 deletions
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 13e026b..0afff0c 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/aarch64/Makefile.in b/sim/aarch64/Makefile.in
index c07a868..ecb5fd4 100644
--- a/sim/aarch64/Makefile.in
+++ b/sim/aarch64/Makefile.in
@@ -29,7 +29,6 @@ SIM_OBJS = \
cpustate.o \
simulator.o \
memory.o \
- sim-hload.o \
sim-resume.o \
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 950a307..5cfc633 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index d23da0a..fb0891a 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -23,7 +23,6 @@ SIM_EXTRA_LIBS = -lm
SIM_OBJS = \
wrapper.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
armemu26.o armemu32.o arminit.o armos.o armsupp.o \
armvirt.o thumbemu.o \
armcopro.o maverick.o iwmmxt.o
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 62bf5b2..d0f63e5 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index d17e915..dc80498 100644
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -19,7 +19,6 @@
SIM_OBJS = \
interp.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 4cdc81c..cc1b3cc 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index a2b6b0b..8e7e69e 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -27,7 +27,6 @@ SIM_OBJS = \
gui.o \
interp.o \
machs.o \
- sim-hload.o \
sim-resume.o
INCLUDE = bfin-sim.h
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 9d15f64..ae94846 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_NEW_COMMON_OBJS): Add sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4 (AH_BOTTOM): Delete tconfig.h appending.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index d2a84d4..152c3c9 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -185,6 +185,7 @@ SIM_NEW_COMMON_OBJS = \
sim-engine.o \
sim-events.o \
sim-fpu.o \
+ sim-hload.o \
sim-hrw.o \
sim-io.o \
sim-info.o \
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 004d729..44e24fe 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index e593218..3994ddc 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -19,7 +19,6 @@
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o \
interp.o \
table.o \
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index f2be067..d6c6b41 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * sim-if.c (cris_program_offset_write, sim_load): Delete.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index 72c0540..142bc7b 100644
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -318,52 +318,6 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write)
return TRUE;
}
-/* Helper for sim_load (needed just for ELF files): like sim_write,
- but offset load at cris_program_offset offset. */
-
-static int
-cris_program_offset_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf,
- int length)
-{
- return sim_write (sd, mem + cris_program_offset, buf, length);
-}
-
-/* Replacement for ../common/sim-hload.c:sim_load, so we can treat ELF
- files differently. */
-
-SIM_RC
-sim_load (SIM_DESC sd, const char *prog_name, struct bfd *prog_bfd,
- int from_tty ATTRIBUTE_UNUSED)
-{
- bfd *result_bfd;
-
- if (bfd_get_flavour (prog_bfd) != bfd_target_elf_flavour)
- {
- SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- if (sim_analyze_program (sd, prog_name, prog_bfd) != SIM_RC_OK)
- return SIM_RC_FAIL;
- SIM_ASSERT (STATE_PROG_BFD (sd) != NULL);
-
- result_bfd = sim_load_file (sd, STATE_MY_NAME (sd),
- STATE_CALLBACK (sd),
- prog_name,
- STATE_PROG_BFD (sd),
- STATE_OPEN_KIND (sd) == SIM_OPEN_DEBUG,
- STATE_LOAD_AT_LMA_P (sd),
- sim_write);
- if (result_bfd == NULL)
- {
- bfd_close (STATE_PROG_BFD (sd));
- STATE_PROG_BFD (sd) = NULL;
- return SIM_RC_FAIL;
- }
- return SIM_RC_OK;
- }
-
- return cris_load_elf_file (sd, prog_bfd, cris_program_offset_write)
- ? SIM_RC_OK : SIM_RC_FAIL;
-}
-
/* Cover function of sim_state_free to free the cpu buffers as well. */
static void
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index d51ede7..0ff2c2b 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index e243066..a206991 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -20,7 +20,6 @@
SIM_OBJS = \
interp.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o \
table.o \
simops.o \
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index d61d12c..c716e6a 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 0f1ce51..5bf7f20 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -21,7 +21,6 @@ FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
cgen-utils.o cgen-trace.o cgen-scache.o cgen-fpu.o cgen-accfp.o \
cgen-run.o \
sim-if.o arch.o \
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 0f3941a..7164c7f 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/ft32/Makefile.in b/sim/ft32/Makefile.in
index 090507f..00acadd 100644
--- a/sim/ft32/Makefile.in
+++ b/sim/ft32/Makefile.in
@@ -21,7 +21,6 @@
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
interp.o \
- sim-hload.o \
sim-resume.o
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 966c27a..8f760bb 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index 24c4a9b..6ffdaac 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -21,7 +21,6 @@ IQ2000_OBJS = iq2000.o cpu.o decode.o sem.o model.o mloop.o
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o \
sim-if.o arch.o \
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 68e8d61..a7596a6 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 7b71549..6a71ace 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -6,7 +6,6 @@
# List of object files, less common parts.
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o \
sim-if.o arch.o \
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index ecbf4cf..6bedd99 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index d57a984..7a08c3b 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -26,7 +26,6 @@ TRAPS_OBJ = @traps_obj@
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o \
sim-if.o arch.o \
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 46e243e..9fd9e28 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index e6aa048..de374d6 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -22,7 +22,6 @@ M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \
SIM_OBJS = $(M68HC11_OBJS) \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o
SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 1d5fa35..fb80f2c 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index c94e5bc..eb664d5 100644
--- a/sim/mcore/Makefile.in
+++ b/sim/mcore/Makefile.in
@@ -23,7 +23,6 @@ NL_TARGET = -DNL_TARGET_mcore
SIM_OBJS = \
interp.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index ed97275..9e88371 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/microblaze/Makefile.in b/sim/microblaze/Makefile.in
index 1b3e1c3..24fa95f 100644
--- a/sim/microblaze/Makefile.in
+++ b/sim/microblaze/Makefile.in
@@ -20,7 +20,6 @@
SIM_OBJS = \
interp.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
sim-resume.o
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 7d7725d..022f960 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 489e9cf..7f1c916 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -69,7 +69,6 @@ SIM_OBJS = \
mdmx.o \
dsp.o \
sim-main.o \
- sim-hload.o \
sim-resume.o \
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 65fa03e..a159aa4 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (MN10300_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 2b96dd7..7ebd4f5 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -21,7 +21,6 @@ MN10300_OBJS = \
itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
$(SIM_NEW_COMMON_OBJS) \
op_utils.o \
- sim-hload.o \
sim-resume.o
SIM_OBJS = $(MN10300_OBJS) interp.o
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 016c61f..10477b4 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index 2d605f5..686152d 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -22,7 +22,6 @@ dtbdir = @datadir@/gdb/dtb
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
interp.o \
- sim-hload.o \
sim-resume.o
SIM_EXTRA_LIBS = -lm -lz
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 0d57e7f..f790a66 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 9d687c9..91473af 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -28,7 +28,6 @@ SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
msp430-sim.o \
trace.o \
- sim-hload.o \
sim-resume.o
# List of extra dependencies.
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index b744ac2..14c4b18 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index d8f4e36..f87dd65 100644
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -20,7 +20,6 @@
SIM_OBJS = \
interp.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
table.o
SIM_EXTRA_LIBS = -lm
SIM_EXTRA_CLEAN = sh-clean
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 7fc3982..945ec35 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index aa84c8d..903eecf 100644
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -23,7 +23,6 @@ SH64_OBJS = sh64.o cpu.o sh-desc.o \
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
- sim-hload.o \
cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o \
sim-if.o arch.o \
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 14fe2eb..e09ad1a 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-27 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Delete sim-hload.o.
+
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 9f53fcd..1d9c026 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -23,7 +23,6 @@ SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
simops.o interp.o \
itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
- sim-hload.o \
sim-resume.o
# List of extra dependencies.