From 180d40b903774d6c7bd8110ce4f77a2f5fb06e7a Mon Sep 17 00:00:00 2001 From: Senthil Kumar Selvaraj Date: Mon, 27 Apr 2015 14:26:04 +0530 Subject: [PATCH] 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. --- sim/avr/ChangeLog | 5 +++++ sim/avr/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index c486303508b..036c057bfd6 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,8 @@ +2015-04-27 Senthil Kumar Selvaraj + + * Makefile.in (SIM_OBJS): Move interp.o + above $(SIM_NEW_COMMON_OBJS). + 2015-04-18 Mike Frysinger * sim-main.h (SIM_CPU): Delete. diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in index 80a1230e9d5..f0a9bcc3f14 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 \ -- 2.30.2