Re: [PATCH] sim: common, microblaze, mn10300: handle signal.h defining REC_PC.

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 969 bytes --]

Hi Mike,

On Sat, Jan 14, 2023 at 07:22:29PM -0500, Mike Frysinger wrote:
> On 15 Jan 2023 00:28, Mark Wielaard wrote:
> > signal.h isn't needed in microblaze and mn10300 interp.c
> > so don't include it.
> 
> these changes are fine to merge if you want to split it out

Thanks. I pushed the attached for just those two changed.

> > In common sim-events.c, sim-signal.c, nrun.c and dv-sockser.c we
> > do need signal.h, but check whether REG_PC is defined (and then
> > undefine it) before including the sim headers.
> > 
> > It breaks the build on sparc because signal.h indirectly
> > includes /usr/include/sys/ucontext.h and defines REG_PC,
> > which is also defined in microblaze-opcm.h
> 
> i don't think this is correct.  none of the files quoted use REG_PC,
> so undefining a random symbol in them doesn't make sense.  nothing in
> sim/common/ uses REG_PC for that matter.

I see what you mean. I'll try to come up with another fix for this
part.

Cheers,

Mark

[-- Attachment #2: 0001-sim-microblaze-mn10300-remove-signal.h-include-in-in.patch --]
[-- Type: text/plain, Size: 1080 bytes --]

From ad6adc6657192a2bec1d721f4e2e7743db4c1da0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 14 Jan 2023 22:54:20 +0100
Subject: [PATCH] sim: microblaze, mn10300: remove signal.h include in interp.c

signal.h isn't needed in microblaze and mn10300 interp.c
so don't include it.
---
 sim/microblaze/interp.c | 1 -
 sim/mn10300/interp.c    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index a4f505e77a8..f53c1d7d65b 100644
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -19,7 +19,6 @@
 /* This must come before any other includes.  */
 #include "defs.h"
 
-#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index 2915551253f..07c3b8c900f 100644
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -1,8 +1,6 @@
 /* This must come before any other includes.  */
 #include "defs.h"
 
-#include <signal.h>
-
 #include "sim-main.h"
 #include "sim-options.h"
 #include "sim-hw.h"
-- 
2.31.1