diff mbox

sim: Fix build for avr simulator

Message ID 20190328180543.9358-1-dimitar@dinux.eu
State New, archived
Headers

Commit Message

Dimitar Dimitrov March 28, 2019, 6:05 p.m. UTC 
  This commit:

  commit ef9866970ce6683d40465fb7c3168f87a1dcd1b7
  Date:   Thu Mar 28 06:40:30 2019 +0900

      sim/common: convert sim-arange to use sim-inline

Broke simulator build for AVR.

sim/avr/ChangeLog:

2019-03-28  Dimitar Dimitrov  <dimitar@dinux.eu>

        * interp.c: Include sim-assert.h

Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
---
 sim/avr/interp.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Andrew Burgess March 28, 2019, 9:28 p.m. UTC | #1 
* Dimitar Dimitrov <dimitar@dinux.eu> [2019-03-28 20:05:43 +0200]:

> This commit:
> 
>   commit ef9866970ce6683d40465fb7c3168f87a1dcd1b7
>   Date:   Thu Mar 28 06:40:30 2019 +0900
> 
>       sim/common: convert sim-arange to use sim-inline
> 
> Broke simulator build for AVR.
> 
> sim/avr/ChangeLog:
> 
> 2019-03-28  Dimitar Dimitrov  <dimitar@dinux.eu>
> 
>         * interp.c: Include sim-assert.h
> 
> Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>

This is fine.

Thanks,
Andrew



> ---
>  sim/avr/interp.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sim/avr/interp.c b/sim/avr/interp.c
> index 973409225a..46f0270961 100644
> --- a/sim/avr/interp.c
> +++ b/sim/avr/interp.c
> @@ -27,6 +27,7 @@
>  #include "gdb/remote-sim.h"
>  
>  #include "sim-main.h"
> +#include "sim-assert.h"
>  #include "sim-base.h"
>  #include "sim-options.h"
>  
> -- 
> 2.11.0
>
Simon Marchi March 28, 2019, 9:35 p.m. UTC | #2 
On 2019-03-28 17:28, Andrew Burgess wrote:
> * Dimitar Dimitrov <dimitar@dinux.eu> [2019-03-28 20:05:43 +0200]:
> 
>> This commit:
>> 
>>   commit ef9866970ce6683d40465fb7c3168f87a1dcd1b7
>>   Date:   Thu Mar 28 06:40:30 2019 +0900
>> 
>>       sim/common: convert sim-arange to use sim-inline
>> 
>> Broke simulator build for AVR.
>> 
>> sim/avr/ChangeLog:
>> 
>> 2019-03-28  Dimitar Dimitrov  <dimitar@dinux.eu>
>> 
>>         * interp.c: Include sim-assert.h
>> 
>> Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
> 
> This is fine.
> 
> Thanks,
> Andrew

I believe that Dimitar doesn't have push access to GDB, so you should 
probably push the patch on his behalf.

Simon
Andrew Burgess March 28, 2019, 10:39 p.m. UTC | #3 
* Simon Marchi <simon.marchi@polymtl.ca> [2019-03-28 17:35:32 -0400]:

> On 2019-03-28 17:28, Andrew Burgess wrote:
> > * Dimitar Dimitrov <dimitar@dinux.eu> [2019-03-28 20:05:43 +0200]:
> > 
> > > This commit:
> > > 
> > >   commit ef9866970ce6683d40465fb7c3168f87a1dcd1b7
> > >   Date:   Thu Mar 28 06:40:30 2019 +0900
> > > 
> > >       sim/common: convert sim-arange to use sim-inline
> > > 
> > > Broke simulator build for AVR.
> > > 
> > > sim/avr/ChangeLog:
> > > 
> > > 2019-03-28  Dimitar Dimitrov  <dimitar@dinux.eu>
> > > 
> > >         * interp.c: Include sim-assert.h
> > > 
> > > Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
> > 
> > This is fine.
> > 
> > Thanks,
> > Andrew
> 
> I believe that Dimitar doesn't have push access to GDB, so you should
> probably push the patch on his behalf.

Thanks for pointing this out.

I've just been investigating and it turns out many other sim targets
were broken by commit ef9866970ce... I think a more general fix is
required, I'll post one soon.

Thanks,
Andrew
diff mbox

Patch

diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index 973409225a..46f0270961 100644
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -27,6 +27,7 @@ 
 #include "gdb/remote-sim.h"
 
 #include "sim-main.h"
+#include "sim-assert.h"
 #include "sim-base.h"
 #include "sim-options.h"