aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>2015-04-27 14:26:04 +0530
committerMike Frysinger <vapier@gentoo.org>2015-04-27 09:54:37 -0400
commit180d40b903774d6c7bd8110ce4f77a2f5fb06e7a (patch)
tree8d020b096999bc37cc16a8a2080806e2ea6c5f4e
parenteb9d6cc91a423f7825a46317e1882e2e9297c76f (diff)
downloadgdb-180d40b903774d6c7bd8110ce4f77a2f5fb06e7a.zip
gdb-180d40b903774d6c7bd8110ce4f77a2f5fb06e7a.tar.gz
gdb-180d40b903774d6c7bd8110ce4f77a2f5fb06e7a.tar.bz2
sim: avr: Fix 'multiple definition of sim_{read,write}'
This patch does whatever was done in https://sourceware.org/ml/gdb-patches/2015-04/msg00437.html to fix broken gdb build for the AVR target.
-rw-r--r--sim/avr/ChangeLog5
-rw-r--r--sim/avr/Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index c486303..036c057 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-27 Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
+
+ * Makefile.in (SIM_OBJS): Move interp.o
+ above $(SIM_NEW_COMMON_OBJS).
+
2015-04-18 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index 80a1230..f0a9bcc 100644
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -17,8 +17,8 @@
## COMMON_PRE_CONFIG_FRAG
SIM_OBJS = \
- $(SIM_NEW_COMMON_OBJS) \
interp.o \
+ $(SIM_NEW_COMMON_OBJS) \
sim-hload.o \
sim-reason.o \
sim-resume.o \