From 8d64d0fdcac27d9aa914bfef11b31e7c0180a360 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 19 Jun 2003 18:42:30 +0000 Subject: 2003-06-19 Andrew Cagney * Makefile.in (ICACHE_CFLAGS, SEMANTICS_CFLAGS): Delete. (SIM_FPU_FLAGS): Define. (icache.o): Delete explicit compile command. (semantics.o, idecode.o): Delete explicit compile command. (NOWARN_CFLAGS, STD_CFLAGS): Append SIM_FPU_CFLAGS. * gen-support.c (gen_support_c): Generate #include of "sim-inline.h" and "sim-fpu.h", but conditional on HAVE_COMMON_FPU. * gen-idecode.c (gen_idecode_c): Ditto. * igen.c (gen_icache_c, gen_semantics_c): Wrap #include of "sim-inline.h" and "sim-fpu.h" in HAVE_COMMON_FPU conditional. Move to before "support.h". * Makefile.in, gen-support.c, gen-idecode.c, igen.c: Update copyright. --- sim/ppc/ChangeLog | 17 +++++++++++++++++ sim/ppc/Makefile.in | 14 +++++--------- sim/ppc/gen-idecode.c | 6 +++++- sim/ppc/gen-support.c | 6 +++++- sim/ppc/igen.c | 10 +++++++--- 5 files changed, 39 insertions(+), 14 deletions(-) (limited to 'sim') diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index b7b1de5..cd2ab4e 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,20 @@ +2003-06-19 Andrew Cagney + + * Makefile.in (ICACHE_CFLAGS, SEMANTICS_CFLAGS): Delete. + (SIM_FPU_FLAGS): Define. + (icache.o): Delete explicit compile command. + (semantics.o, idecode.o): Delete explicit compile command. + (NOWARN_CFLAGS, STD_CFLAGS): Append SIM_FPU_CFLAGS. + * gen-support.c (gen_support_c): Generate #include of + "sim-inline.h" and "sim-fpu.h", but conditional on + HAVE_COMMON_FPU. + * gen-idecode.c (gen_idecode_c): Ditto. + * igen.c (gen_icache_c, gen_semantics_c): Wrap #include of + "sim-inline.h" and "sim-fpu.h" in HAVE_COMMON_FPU conditional. + Move to before "support.h". + * Makefile.in, gen-support.c, gen-idecode.c, igen.c: Update + copyright. + 2003-05-16 Ian Lance Taylor * Makefile.in (various): Use $(SHELL) whenever we invoke diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 0fb8f48..fdaab4d 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -1,7 +1,7 @@ # # This file is part of the program psim. # -# Copyright (C) 1994-1997, Andrew Cagney +# Copyright 1994, 1995, 1996, 1997, 2003 Andrew Cagney # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -112,9 +112,10 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \ $(STDIO_CFLAGS) \ $(TERMIO_CFLAGS) \ $(DEVZERO_CFLAGS) +SIM_FPU_CFLAGS = @sim_fpu_cflags@ -STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) -NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) +STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) +NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) BUILD_CFLAGS = -g -O $(INCLUDES) $(WARNING_CFLAGS) BUILD_LDFLAGS = @@ -147,6 +148,7 @@ MAKEOVERRIDES= LIB_INCLUDES = -I$(srcdir)/../../include BFD_INCLUDES = -I../../bfd -I$(srcdir)/../../bfd GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config -I$(srcdir)/../../mmalloc + INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) LIBIBERTY_LIB = ../../libiberty/libiberty.a @@ -319,9 +321,6 @@ LIB_OBJ = \ GDB_OBJ = sim_calls.o @sim_callback@ -ICACHE_CFLAGS = @sim_fpu_cflags@ -SEMANTICS_CFLAGS = @sim_fpu_cflags@ - HW_SRC = @sim_hw_src@ HW_OBJ = @sim_hw_obj@ @@ -367,7 +366,6 @@ interrupts.o: interrupts.c $(CPU_H) $(IDECODE_H) os_emul.h # Given that inlines are turned on now, rebuild idecode whenever # anything changes. idecode.o: idecode.c $(CPU_H) $(IDECODE_H) semantics.h $(LIB_INLINE_SRC) $(BUILT_SRC) - $(CC) -c $(NOWARN_CFLAGS) $< # double.o: double.c dp-bit.c @@ -394,10 +392,8 @@ device_table.o: device_table.c $(DEVICE_TABLE_H) events.h hw.c cap.o: cap.c cap.h $(BASICS_H) semantics.o: semantics.c semantics.h $(CPU_H) $(IDECODE_H) - $(CC) -c $(SEMANTICS_CFLAGS) $(NOWARN_CFLAGS) $< icache.o: icache.c icache.h $(IDECODE_H) $(CPU_H) - $(CC) -c $(ICACHE_CFLAGS) $(NOWARN_CFLAGS) $< support.o: support.c support.h $(IDECODE_H) $(CPU_H) diff --git a/sim/ppc/gen-idecode.c b/sim/ppc/gen-idecode.c index 3b88866..8c29cc4 100644 --- a/sim/ppc/gen-idecode.c +++ b/sim/ppc/gen-idecode.c @@ -1,6 +1,6 @@ /* This file is part of the program psim. - Copyright (C) 1994-1997, Andrew Cagney + Copyright 1994, 1995, 1996, 1997, 2003 Andrew Cagney This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1499,6 +1499,10 @@ gen_idecode_c(lf *file, lf_printf(file, "#include \"idecode.h\"\n"); lf_printf(file, "#include \"semantics.h\"\n"); lf_printf(file, "#include \"icache.h\"\n"); + lf_printf(file, "#ifdef HAVE_COMMON_FPU\n"); + lf_printf(file, "#include \"sim-inline.h\"\n"); + lf_printf(file, "#include \"sim-fpu.h\"\n"); + lf_printf(file, "#endif\n"); lf_printf(file, "#include \"support.h\"\n"); lf_printf(file, "\n"); lf_printf(file, "#include \n"); diff --git a/sim/ppc/gen-support.c b/sim/ppc/gen-support.c index d3067c3..ed02d7d 100644 --- a/sim/ppc/gen-support.c +++ b/sim/ppc/gen-support.c @@ -1,6 +1,6 @@ /* This file is part of the program psim. - Copyright (C) 1994-1995, Andrew Cagney + Copyright 1994, 1995, 2003 Andrew Cagney This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -122,6 +122,10 @@ gen_support_c(insn_table *table, { lf_printf(file, "#include \"cpu.h\"\n"); lf_printf(file, "#include \"idecode.h\"\n"); + lf_printf(file, "#ifdef HAVE_COMMON_FPU\n"); + lf_printf(file, "#include \"sim-inline.h\"\n"); + lf_printf(file, "#include \"sim-fpu.h\"\n"); + lf_printf(file, "#endif\n"); lf_printf(file, "#include \"support.h\"\n"); lf_printf(file, "\n"); diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c index 7008e96..464ae87 100644 --- a/sim/ppc/igen.c +++ b/sim/ppc/igen.c @@ -1,6 +1,6 @@ /* This file is part of the program psim. - Copyright (C) 1994-1997, Andrew Cagney + Copyright 1994, 1995, 1996, 1997, 2003 Andrew Cagney This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -220,9 +220,11 @@ gen_semantics_c(insn_table *table, lf_printf(file, "#include \"cpu.h\"\n"); lf_printf(file, "#include \"idecode.h\"\n"); lf_printf(file, "#include \"semantics.h\"\n"); - lf_printf(file, "#include \"support.h\"\n"); + lf_printf(file, "#ifdef HAVE_COMMON_FPU\n"); lf_printf(file, "#include \"sim-inline.h\"\n"); lf_printf(file, "#include \"sim-fpu.h\"\n"); + lf_printf(file, "#endif\n"); + lf_printf(file, "#include \"support.h\"\n"); lf_printf(file, "\n"); lf_printf(file, "int option_mpc860c0 = 0;\n"); lf_printf(file, "\n"); @@ -306,9 +308,11 @@ gen_icache_c(insn_table *table, lf_printf(file, "#include \"idecode.h\"\n"); lf_printf(file, "#include \"semantics.h\"\n"); lf_printf(file, "#include \"icache.h\"\n"); - lf_printf(file, "#include \"support.h\"\n"); + lf_printf(file, "#ifdef HAVE_COMMON_FPU\n"); lf_printf(file, "#include \"sim-inline.h\"\n"); lf_printf(file, "#include \"sim-fpu.h\"\n"); + lf_printf(file, "#endif\n"); + lf_printf(file, "#include \"support.h\"\n"); lf_printf(file, "\n"); insn_table_traverse_function(table, file, NULL, -- cgit v1.1