From d6581fcd69a8e248db054fdad57b92b024bb9db0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Apr 2021 19:51:54 -0600 Subject: [PATCH] Remove INCLUDE variable from some sim Makefiles Some Makefiles in sim define INCLUDE but don't use it. This removes these instances. sim/bfin/ChangeLog 2021-04-22 Tom Tromey * Makefile.in (INCLUDE): Remove. sim/m68hc11/ChangeLog 2021-04-22 Tom Tromey * Makefile.in (INCLUDE): Remove. sim/mn10300/ChangeLog 2021-04-22 Tom Tromey * Makefile.in (INCLUDE): Remove. sim/v850/ChangeLog 2021-04-22 Tom Tromey * Makefile.in (INCLUDE): Remove. --- sim/bfin/ChangeLog | 4 ++++ sim/bfin/Makefile.in | 2 -- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/Makefile.in | 3 --- sim/mn10300/ChangeLog | 4 ++++ sim/mn10300/Makefile.in | 2 -- sim/v850/ChangeLog | 4 ++++ sim/v850/Makefile.in | 2 -- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 50091a508c0..d8d6d7ba68e 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-04-22 Tom Tromey + + * Makefile.in (INCLUDE): Remove. + 2021-04-22 Tom Tromey * configure: Rebuild. diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in index 0c3e7551d4f..a5c16764682 100644 --- a/sim/bfin/Makefile.in +++ b/sim/bfin/Makefile.in @@ -29,8 +29,6 @@ SIM_OBJS = \ machs.o \ sim-resume.o -INCLUDE = bfin-sim.h - SIM_EXTRA_CFLAGS = @SDL_CFLAGS@ SIM_EXTRA_LIBS = @SDL_LIBS@ -lm diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 9f666da5de1..9cc11481fb7 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2021-04-22 Tom Tromey + + * Makefile.in (INCLUDE): Remove. + 2021-04-22 Tom Tromey * Makefile.in (interp.o): Remove. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 9ebcf65c629..8a044914ed6 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -36,9 +36,6 @@ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 \ -DWITH_TARGET_WORD_MSB=31 SIM_EXTRA_CLEAN = clean-extra -INCLUDE = $(srcdir)/../../include/gdb/callback.h \ - interrupts.h sim-main.h - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 8daf6fd19c8..e6d119c85ab 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2021-04-22 Tom Tromey + + * Makefile.in (INCLUDE): Remove. + 2021-04-22 Tom Tromey * Makefile.in (interp.o): Remove. diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index 07ef9d973f6..9852f663ecb 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -32,8 +32,6 @@ SIM_EXTRA_DEPS = mn10300_sim.h itable.h idecode.h # Select mn10300 support in nltvals.def. NL_TARGET = -DNL_TARGET_mn10300 -INCLUDE = mn10300_sim.h $(srcdir)/../../include/gdb/callback.h - # List of extra flags to always pass to $(CC). SIM_EXTRA_CFLAGS = -DPOLL_QUIT_INTERVAL=0x20 diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index ed9616e1a97..ccf2586cb43 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2021-04-22 Tom Tromey + + * Makefile.in (INCLUDE): Remove. + 2021-04-22 Tom Tromey * Makefile.in (interp.o, simops.o, semantics.o): Remove. diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in index 1f9d8c55c37..3e1b4054174 100644 --- a/sim/v850/Makefile.in +++ b/sim/v850/Makefile.in @@ -35,8 +35,6 @@ SIM_EXTRA_CFLAGS = \ -I$(srcdir)/../../newlib/libc/sys/sysnecv850 SIM_EXTRA_CLEAN = clean-extra -INCLUDE = $(sim_main_headers) $(SIM_EXTRA_DEPS) - NL_TARGET = -DNL_TARGET_v850 ## COMMON_POST_CONFIG_FRAG -- 2.30.2