From: Mike Frysinger Date: Sun, 15 Mar 2015 03:41:25 +0000 (-0400) Subject: sim: rename tconfig.in to tconfig.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae7d0cac8ce971f7108d270c1d3f8481919b1e86;p=binutils-gdb.git sim: rename tconfig.in to tconfig.h Rather than manually include tconfig.h when we think we'll need it (which is error prone as it can define symbols we expect from config.h), have it be included directly by config.h. Since we know we have to include that header everywhere already, this will make sure tconfig.h isn't missed. It should also be fine as tconfig.h is supposed to be simple and only set up a few core defines for the target. This allows us to stop symlinking it in place all the time and just use it straight out of the respective source directory. --- diff --git a/sim/.gitignore b/sim/.gitignore index 9440b897321..0dce65bb4ec 100644 --- a/sim/.gitignore +++ b/sim/.gitignore @@ -2,7 +2,6 @@ /*/run /*/hw-config.h /*/targ-* -/*/tconfig.h /*/version.c /common/cconfig.h diff --git a/sim/ChangeLog b/sim/ChangeLog index 35d092006f8..37ee409817f 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,8 @@ +2015-03-16 Mike Frysinger + + * .gitignore: Delete tconfig.h. + * README-HACKING: Change tconfig.in to tconfig.h. + 2014-03-12 Nick Clifton * MAINTAINERS: Add myself as the maintainer for the MSP430. diff --git a/sim/README-HACKING b/sim/README-HACKING index 33b6ecb6cbc..0a6bbe21e47 100644 --- a/sim/README-HACKING +++ b/sim/README-HACKING @@ -7,7 +7,7 @@ Contents - Common Makefile Support - TAGS support - Generating "configure" files -- tconfig.in +- tconfig.h - C Language Assumptions - "dump" commands under gdb @@ -159,12 +159,12 @@ To add the entries to an alternative ChangeLog file, use: $ make ChangeLog=MyChangeLog .... -tconfig.in +tconfig.h ========== -File tconfig.in defines one or more target configuration macros +File tconfig.h defines one or more target configuration macros (e.g. a tm.h file). There are very few that need defining. -For a list of all of them, see common/tconfig.in. +For a list of all of them, see common/tconfig.h. It contains them all, commented out. The intent is that a new port can just copy this file and define the ones it needs. diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index bd4ddf22521..94bd72f4b64 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Add diff --git a/sim/arm/config.in b/sim/arm/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/arm/config.in +++ b/sim/arm/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/arm/configure b/sim/arm/configure index 9ee8a770663..4e0221e5f22 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -8271,6 +8271,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12353,7 +12355,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12356 "configure" +#line 12358 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12459,7 +12461,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12462 "configure" +#line 12464 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12940,14 +12942,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/arm/tconfig.h b/sim/arm/tconfig.h new file mode 100644 index 00000000000..04f702d5a4e --- /dev/null +++ b/sim/arm/tconfig.h @@ -0,0 +1,17 @@ +/* ARM target configuration file. */ + +/* Define this if the simulator supports profiling. + See the mips simulator for an example. + This enables the `-p foo' and `-s bar' options. + The target is required to provide sim_set_profile{,_size}. */ +/* #define SIM_HAVE_PROFILE */ + +/* Define this if the simulator uses an instruction cache. + See the h8/300 simulator for an example. + This enables the `-c size' option to set the size of the cache. + The target is required to provide sim_set_simcache_size. */ +/* #define SIM_HAVE_SIMCACHE */ + +/* Define this if the target cpu is bi-endian + and the simulator supports it. */ +#define SIM_HAVE_BIENDIAN diff --git a/sim/arm/tconfig.in b/sim/arm/tconfig.in deleted file mode 100644 index 04f702d5a4e..00000000000 --- a/sim/arm/tconfig.in +++ /dev/null @@ -1,17 +0,0 @@ -/* ARM target configuration file. */ - -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -/* #define SIM_HAVE_PROFILE */ - -/* Define this if the simulator uses an instruction cache. - See the h8/300 simulator for an example. - This enables the `-c size' option to set the size of the cache. - The target is required to provide sim_set_simcache_size. */ -/* #define SIM_HAVE_SIMCACHE */ - -/* Define this if the target cpu is bi-endian - and the simulator supports it. */ -#define SIM_HAVE_BIENDIAN diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 9105e38f0c6..6f1e042f5cc 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Set to diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/avr/aclocal.m4 +++ b/sim/avr/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/avr/config.in b/sim/avr/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/avr/config.in +++ b/sim/avr/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/avr/configure b/sim/avr/configure index 3f271cc51b4..fa262774f0b 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -8119,7 +8119,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10142,7 +10144,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 4e2077d3102..13617ded8d7 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in: Delete includes. diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index e93cce77183..a1b18dcbc28 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -287,8 +286,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -308,7 +307,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -324,13 +323,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -339,7 +338,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/bfin/config.in b/sim/bfin/config.in index 4e2f6d4c253..20a094e3336 100644 --- a/sim/bfin/config.in +++ b/sim/bfin/config.in @@ -213,3 +213,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/bfin/configure b/sim/bfin/configure index 6654216d431..e77e98ae7b5 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -8161,7 +8161,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8312,6 +8312,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10184,7 +10186,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12394,7 +12396,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12397 "configure" +#line 12399 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12500,7 +12502,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12503 "configure" +#line 12505 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12981,14 +12983,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/bfin/tconfig.h b/sim/bfin/tconfig.h new file mode 100644 index 00000000000..d28fd8d9f59 --- /dev/null +++ b/sim/bfin/tconfig.h @@ -0,0 +1,15 @@ +/* Blackfin target configuration file. -*- C -*- */ + +/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ +#define SIM_HANDLES_LMA 1 + +/* We use this so that we are passed the requesting CPU for HW acesses. + Common sim core by default sets hw_system_cpu to NULL for WITH_HW. */ +#define WITH_DEVICES 1 + +/* ??? Temporary hack until model support unified. */ +#define SIM_HAVE_MODEL + +/* Allows us to do the memory aliasing that some bfroms have: + {0xef000000 - 0xef100000} => {0xef000000 - 0xef000800} */ +#define WITH_MODULO_MEMORY 1 diff --git a/sim/bfin/tconfig.in b/sim/bfin/tconfig.in deleted file mode 100644 index d28fd8d9f59..00000000000 --- a/sim/bfin/tconfig.in +++ /dev/null @@ -1,15 +0,0 @@ -/* Blackfin target configuration file. -*- C -*- */ - -/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ -#define SIM_HANDLES_LMA 1 - -/* We use this so that we are passed the requesting CPU for HW acesses. - Common sim core by default sets hw_system_cpu to NULL for WITH_HW. */ -#define WITH_DEVICES 1 - -/* ??? Temporary hack until model support unified. */ -#define SIM_HAVE_MODEL - -/* Allows us to do the memory aliasing that some bfroms have: - {0xef000000 - 0xef100000} => {0xef000000 - 0xef000800} */ -#define WITH_MODULO_MEMORY 1 diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 08d3b933d10..b7567331d2c 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,12 @@ +2015-03-16 Mike Frysinger + + * acinclude.m4 (SIM_AC_COMMON): Call AH_BOTTOM. Delete logic for + symlinking tconfig.h to tconfig.in. + * config.in, configure: Regenerate. + * nrun.c, run.c, sim-basics.h: Delete tconfig.h include. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * dv-socker.h (dv_sockser_install): Declare. diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index f96ec35c2fc..2e1d31fa393 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -53,6 +53,9 @@ AR=${AR-ar} AC_SUBST(AR) AC_PROG_RANLIB +dnl Pull in the target configuration file directly. +AH_BOTTOM([#include "tconfig.h"]) + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -247,16 +250,6 @@ dnl These are available to append to as desired. sim_link_files= sim_link_links= -dnl Create tconfig.h either from simulator's tconfig.in or default one -dnl in common. -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/common/config.in b/sim/common/config.in index 5b8ebd896e1..e0ca8ae1003 100644 --- a/sim/common/config.in +++ b/sim/common/config.in @@ -210,3 +210,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/common/configure b/sim/common/configure index add4c0f354c..db5f661b259 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -6541,6 +6541,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10623,7 +10625,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10626 "configure" +#line 10628 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10729,7 +10731,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10732 "configure" +#line 10734 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11210,14 +11212,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/common/nrun.c b/sim/common/nrun.c index eccb0cb0c6e..e3f3c423612 100644 --- a/sim/common/nrun.c +++ b/sim/common/nrun.c @@ -17,7 +17,6 @@ along with this program. If not, see . */ /* Need to be before general includes, to pick up e.g. _GNU_SOURCE. */ #ifdef HAVE_CONFIG_H #include "cconfig.h" -#include "tconfig.h" #endif #include diff --git a/sim/common/run.c b/sim/common/run.c index e4746619d73..3be10ab16d6 100644 --- a/sim/common/run.c +++ b/sim/common/run.c @@ -19,7 +19,6 @@ along with this program. If not, see . */ #ifdef HAVE_CONFIG_H #include "cconfig.h" -#include "tconfig.h" #endif #include diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index 2a410bb1729..2730569b47d 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -126,11 +126,6 @@ typedef enum { /* Basic definitions - ordered so that nothing calls what comes after it. */ -/* FIXME: conditionalizing tconfig.h on HAVE_CONFIG_H seems wrong. */ -#ifdef HAVE_CONFIG_H -#include "tconfig.h" -#endif - #include "ansidecl.h" #include "gdb/callback.h" #include "gdb/remote-sim.h" diff --git a/sim/common/tconfig.h b/sim/common/tconfig.h new file mode 100644 index 00000000000..fd8b5be47fe --- /dev/null +++ b/sim/common/tconfig.h @@ -0,0 +1,19 @@ +/* Default target configuration file. + To override this, create file `tconfig.in' in the simulator's + source directory. */ + +/* Define this if the simulator supports profiling. + See the mips simulator for an example. + This enables the `-p foo' and `-s bar' options. + The target is required to provide sim_set_profile{,_size}. */ +/* #define SIM_HAVE_PROFILE */ + +/* Define this if the simulator uses an instruction cache. + See the h8/300 simulator for an example. + This enables the `-c size' option to set the size of the cache. + The target is required to provide sim_set_simcache_size. */ +/* #define SIM_HAVE_SIMCACHE */ + +/* Define this if the target cpu is bi-endian + and the simulator supports it. */ +/* #define SIM_HAVE_BIENDIAN */ diff --git a/sim/common/tconfig.in b/sim/common/tconfig.in deleted file mode 100644 index fd8b5be47fe..00000000000 --- a/sim/common/tconfig.in +++ /dev/null @@ -1,19 +0,0 @@ -/* Default target configuration file. - To override this, create file `tconfig.in' in the simulator's - source directory. */ - -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -/* #define SIM_HAVE_PROFILE */ - -/* Define this if the simulator uses an instruction cache. - See the h8/300 simulator for an example. - This enables the `-c size' option to set the size of the cache. - The target is required to provide sim_set_simcache_size. */ -/* #define SIM_HAVE_SIMCACHE */ - -/* Define this if the target cpu is bi-endian - and the simulator supports it. */ -/* #define SIM_HAVE_BIENDIAN */ diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 3a81178bfe9..966937964a4 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Add diff --git a/sim/cr16/config.in b/sim/cr16/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/cr16/config.in +++ b/sim/cr16/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/cr16/configure b/sim/cr16/configure index b154ae0760f..c7e82ec0b2d 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -8278,6 +8278,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12360,7 +12362,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12363 "configure" +#line 12365 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12466,7 +12468,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12469 "configure" +#line 12471 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12947,14 +12949,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 9432e32ef90..d2f912dcd52 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,10 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * rvdummy.c: Delete tconfig.h include. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in: Delete most includes. diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/cris/config.in b/sim/cris/config.in index 05c2fdee8eb..c3337313310 100644 --- a/sim/cris/config.in +++ b/sim/cris/config.in @@ -177,3 +177,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/cris/configure b/sim/cris/configure index 610da55f4aa..7c9094ec2fc 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -8148,7 +8148,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8299,6 +8299,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10171,7 +10173,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12381,7 +12383,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12384 "configure" +#line 12386 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12487,7 +12489,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12490 "configure" +#line 12492 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12968,14 +12970,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/cris/rvdummy.c b/sim/cris/rvdummy.c index 6e2e0926b5c..f7886865fdf 100644 --- a/sim/cris/rvdummy.c +++ b/sim/cris/rvdummy.c @@ -31,7 +31,6 @@ main (int argc, char *argv[]) #ifdef HAVE_CONFIG_H #include "cconfig.h" -#include "tconfig.h" #endif #include "getopt.h" diff --git a/sim/cris/tconfig.h b/sim/cris/tconfig.h new file mode 100644 index 00000000000..8f82ac7932b --- /dev/null +++ b/sim/cris/tconfig.h @@ -0,0 +1,44 @@ +/* CRIS target configuration file. -*- C -*- + Copyright (C) 2004-2015 Free Software Foundation, Inc. + Contributed by Axis Communications. + +This file is part of the GNU simulators. + +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 +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . */ + +#ifndef CRIS_TCONFIG_H +#define CRIS_TCONFIG_H + +/* There's basically a a big ??? FIXME: CHECK THIS on everything in this + file. I just copied it from m32r, pruned some stuff and added + HAVE_MODEL because it seemed useful. */ + +/* See sim-hload.c. We properly handle LMA. */ +#define SIM_HANDLES_LMA 1 + +/* For MSPR support. FIXME: revisit. */ +#define WITH_DEVICES 1 + +#include "sim-module.h" +extern MODULE_INSTALL_FN cris_option_install; +#define MODULE_LIST cris_option_install, + +#define SIM_HAVE_MODEL + +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. */ +#define WITH_SCACHE_PBB 1 + +#endif /* CRIS_TCONFIG_H */ diff --git a/sim/cris/tconfig.in b/sim/cris/tconfig.in deleted file mode 100644 index 8f82ac7932b..00000000000 --- a/sim/cris/tconfig.in +++ /dev/null @@ -1,44 +0,0 @@ -/* CRIS target configuration file. -*- C -*- - Copyright (C) 2004-2015 Free Software Foundation, Inc. - Contributed by Axis Communications. - -This file is part of the GNU simulators. - -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 -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . */ - -#ifndef CRIS_TCONFIG_H -#define CRIS_TCONFIG_H - -/* There's basically a a big ??? FIXME: CHECK THIS on everything in this - file. I just copied it from m32r, pruned some stuff and added - HAVE_MODEL because it seemed useful. */ - -/* See sim-hload.c. We properly handle LMA. */ -#define SIM_HANDLES_LMA 1 - -/* For MSPR support. FIXME: revisit. */ -#define WITH_DEVICES 1 - -#include "sim-module.h" -extern MODULE_INSTALL_FN cris_option_install; -#define MODULE_LIST cris_option_install, - -#define SIM_HAVE_MODEL - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. */ -#define WITH_SCACHE_PBB 1 - -#endif /* CRIS_TCONFIG_H */ diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 728d5af5b9f..8bb2666904a 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Add diff --git a/sim/d10v/config.in b/sim/d10v/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/d10v/config.in +++ b/sim/d10v/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/d10v/configure b/sim/d10v/configure index b154ae0760f..c7e82ec0b2d 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -8278,6 +8278,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12360,7 +12362,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12363 "configure" +#line 12365 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12466,7 +12468,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12469 "configure" +#line 12471 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12947,14 +12949,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 41c465e5405..8211b4a3cfc 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-16 Jiri Gaisler * Makefile.in (end, end.h): Remove target rules. diff --git a/sim/erc32/config.in b/sim/erc32/config.in index b367e1429a7..6003e581c68 100644 --- a/sim/erc32/config.in +++ b/sim/erc32/config.in @@ -159,3 +159,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/erc32/configure b/sim/erc32/configure index 4899feb7c7b..6b1f4bbd46f 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -8274,6 +8274,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12356,7 +12358,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12359 "configure" +#line 12361 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12462,7 +12464,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12465 "configure" +#line 12467 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12943,14 +12945,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index d178047a619..5968f7eaedd 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in [HAVE_DV_SOCKSER]: Delete. diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/frv/config.in b/sim/frv/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/frv/config.in +++ b/sim/frv/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/frv/configure b/sim/frv/configure index 78b5450af75..d3129718eb8 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -8143,7 +8143,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8294,6 +8294,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10166,7 +10168,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12376,7 +12378,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12379 "configure" +#line 12381 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12482,7 +12484,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12485 "configure" +#line 12487 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12963,14 +12965,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h new file mode 100644 index 00000000000..b31043cd82a --- /dev/null +++ b/sim/frv/tconfig.h @@ -0,0 +1,36 @@ +/* FRV target configuration file. -*- C -*- */ + +/* Define this if the simulator can vary the size of memory. + See the xxx simulator for an example. + This enables the `-m size' option. + The memory size is stored in STATE_MEM_SIZE. */ +/* Not used for FRV since we use the memory module. TODO -- check this */ +/* #define SIM_HAVE_MEM_SIZE */ + +/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ +#define SIM_HANDLES_LMA 1 + +/* For MSPR support. FIXME: revisit. */ +#define WITH_DEVICES 1 + +#if 0 +/* Enable watchpoints. */ +#define WITH_WATCHPOINTS 1 +#endif + +/* ??? Temporary hack until model support unified. */ +#define SIM_HAVE_MODEL + +/* Define this to enable the intrinsic breakpoint mechanism. */ +/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially + duplicates ifdef SIM_BREAKPOINT (right?) */ +#if 0 +#define SIM_HAVE_BREAKPOINTS +#define SIM_BREAKPOINT { 0x10, 0xf1 } +#define SIM_BREAKPOINT_SIZE 2 +#endif + +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 0 diff --git a/sim/frv/tconfig.in b/sim/frv/tconfig.in deleted file mode 100644 index b31043cd82a..00000000000 --- a/sim/frv/tconfig.in +++ /dev/null @@ -1,36 +0,0 @@ -/* FRV target configuration file. -*- C -*- */ - -/* Define this if the simulator can vary the size of memory. - See the xxx simulator for an example. - This enables the `-m size' option. - The memory size is stored in STATE_MEM_SIZE. */ -/* Not used for FRV since we use the memory module. TODO -- check this */ -/* #define SIM_HAVE_MEM_SIZE */ - -/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ -#define SIM_HANDLES_LMA 1 - -/* For MSPR support. FIXME: revisit. */ -#define WITH_DEVICES 1 - -#if 0 -/* Enable watchpoints. */ -#define WITH_WATCHPOINTS 1 -#endif - -/* ??? Temporary hack until model support unified. */ -#define SIM_HAVE_MODEL - -/* Define this to enable the intrinsic breakpoint mechanism. */ -/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially - duplicates ifdef SIM_BREAKPOINT (right?) */ -#if 0 -#define SIM_HAVE_BREAKPOINTS -#define SIM_BREAKPOINT { 0x10, 0xf1 } -#define SIM_BREAKPOINT_SIZE 2 -#endif - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 0 diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index ec21cbfb77d..0ef2344d162 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_RUN_OBJS): Delete. diff --git a/sim/h8300/config.in b/sim/h8300/config.in index e58e199ff60..27216dce3f9 100644 --- a/sim/h8300/config.in +++ b/sim/h8300/config.in @@ -147,3 +147,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/h8300/configure b/sim/h8300/configure index 39185a1a714..37b2d871962 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/h8300/tconfig.h b/sim/h8300/tconfig.h new file mode 100644 index 00000000000..d9599dbcd7a --- /dev/null +++ b/sim/h8300/tconfig.h @@ -0,0 +1,17 @@ +/* h8300 target configuration file. */ + +/* Define this if the simulator supports profiling. + See the mips simulator for an example. + This enables the `-p foo' and `-s bar' options. + The target is required to provide sim_set_profile{,_size}. */ +/* #define SIM_HAVE_PROFILE */ + +/* Define this if the simulator uses an instruction cache. + See the h8/300 simulator for an example. + This enables the `-c size' option to set the size of the cache. + The target is required to provide sim_set_simcache_size. */ +#define SIM_HAVE_SIMCACHE + +/* FIXME: This is a quick hack for run.c so it can support the `-h' option. + It will eventually be replaced by a more general facility. */ +#define SIM_H8300 diff --git a/sim/h8300/tconfig.in b/sim/h8300/tconfig.in deleted file mode 100644 index d9599dbcd7a..00000000000 --- a/sim/h8300/tconfig.in +++ /dev/null @@ -1,17 +0,0 @@ -/* h8300 target configuration file. */ - -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -/* #define SIM_HAVE_PROFILE */ - -/* Define this if the simulator uses an instruction cache. - See the h8/300 simulator for an example. - This enables the `-c size' option to set the size of the cache. - The target is required to provide sim_set_simcache_size. */ -#define SIM_HAVE_SIMCACHE - -/* FIXME: This is a quick hack for run.c so it can support the `-h' option. - It will eventually be replaced by a more general facility. */ -#define SIM_H8300 diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index b682fac02ba..884c21f5fd1 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in [HAVE_DV_SOCKSER]: Delete. diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/iq2000/config.in +++ b/sim/iq2000/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 626fbddbac8..353ace0ddae 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -8142,7 +8142,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8293,6 +8293,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10165,7 +10167,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12375,7 +12377,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12378 "configure" +#line 12380 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12481,7 +12483,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12484 "configure" +#line 12486 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12962,14 +12964,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h new file mode 100644 index 00000000000..0081bb4394f --- /dev/null +++ b/sim/iq2000/tconfig.h @@ -0,0 +1,36 @@ +/* IQ2000 target configuration file. -*- C -*- */ + +/* Define this if the simulator can vary the size of memory. + See the xxx simulator for an example. + This enables the `-m size' option. + The memory size is stored in STATE_MEM_SIZE. */ +/* Not used for IQ2000 since we use the memory module. TODO -- check this */ +/* #define SIM_HAVE_MEM_SIZE */ + +/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ +#define SIM_HANDLES_LMA 1 + +/* For MSPR support. FIXME: revisit. */ +#define WITH_DEVICES 0 + +#if 0 +/* Enable watchpoints. */ +#define WITH_WATCHPOINTS 1 +#endif + +/* ??? Temporary hack until model support unified. */ +#define SIM_HAVE_MODEL + +/* Define this to enable the intrinsic breakpoint mechanism. */ +/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially + duplicates ifdef SIM_BREAKPOINT (right?) */ +#if 1 +#define SIM_HAVE_BREAKPOINTS +#define SIM_BREAKPOINT { 0, 0, 0, 0xD } +#define SIM_BREAKPOINT_SIZE 4 +#endif + +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 1 diff --git a/sim/iq2000/tconfig.in b/sim/iq2000/tconfig.in deleted file mode 100644 index 0081bb4394f..00000000000 --- a/sim/iq2000/tconfig.in +++ /dev/null @@ -1,36 +0,0 @@ -/* IQ2000 target configuration file. -*- C -*- */ - -/* Define this if the simulator can vary the size of memory. - See the xxx simulator for an example. - This enables the `-m size' option. - The memory size is stored in STATE_MEM_SIZE. */ -/* Not used for IQ2000 since we use the memory module. TODO -- check this */ -/* #define SIM_HAVE_MEM_SIZE */ - -/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ -#define SIM_HANDLES_LMA 1 - -/* For MSPR support. FIXME: revisit. */ -#define WITH_DEVICES 0 - -#if 0 -/* Enable watchpoints. */ -#define WITH_WATCHPOINTS 1 -#endif - -/* ??? Temporary hack until model support unified. */ -#define SIM_HAVE_MODEL - -/* Define this to enable the intrinsic breakpoint mechanism. */ -/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially - duplicates ifdef SIM_BREAKPOINT (right?) */ -#if 1 -#define SIM_HAVE_BREAKPOINTS -#define SIM_BREAKPOINT { 0, 0, 0, 0xD } -#define SIM_BREAKPOINT_SIZE 4 -#endif - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 1 diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 954cd836d7d..a02609e1f62 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * Makefile.in (SIM_OBJS): Add @SIM_DV_SOCKSER_O@. diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/lm32/config.in b/sim/lm32/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/lm32/config.in +++ b/sim/lm32/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/lm32/configure b/sim/lm32/configure index b48cb20eb2f..22ed7d5fb1d 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -8140,7 +8140,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8291,6 +8291,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10163,7 +10165,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12373,7 +12375,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12376 "configure" +#line 12378 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12479,7 +12481,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12482 "configure" +#line 12484 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12960,14 +12962,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/lm32/tconfig.h b/sim/lm32/tconfig.h new file mode 100644 index 00000000000..0970c810801 --- /dev/null +++ b/sim/lm32/tconfig.h @@ -0,0 +1,27 @@ +/* Lattice Mico32 simulator configuration. + Contributed by Jon Beniston + + This file is part of GDB. + + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef LM32_TCONFIG_H +#define LM32_TCONFIG_H + +/* See sim-hload.c. We properly handle LMA. */ +#define SIM_HANDLES_LMA 1 + +#define WITH_SCACHE_PBB 1 + +#endif /* LM32_TCONFIG_H */ diff --git a/sim/lm32/tconfig.in b/sim/lm32/tconfig.in deleted file mode 100644 index 0970c810801..00000000000 --- a/sim/lm32/tconfig.in +++ /dev/null @@ -1,27 +0,0 @@ -/* Lattice Mico32 simulator configuration. - Contributed by Jon Beniston - - This file is part of GDB. - - 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifndef LM32_TCONFIG_H -#define LM32_TCONFIG_H - -/* See sim-hload.c. We properly handle LMA. */ -#define SIM_HANDLES_LMA 1 - -#define WITH_SCACHE_PBB 1 - -#endif /* LM32_TCONFIG_H */ diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 9259ad76f59..9e2adcc5f55 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + 2014-08-19 Alan Modra * configure: Regenerate. diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/m32c/aclocal.m4 +++ b/sim/m32c/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/m32c/config.in b/sim/m32c/config.in index 88ae4155376..02a82aea2f4 100644 --- a/sim/m32c/config.in +++ b/sim/m32c/config.in @@ -159,3 +159,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/m32c/configure b/sim/m32c/configure index dcc8c2d456b..ca46b2b6fd9 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -8119,7 +8119,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10142,7 +10144,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index ee4d6898ba2..bc379a092ef 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in [HAVE_DV_SOCKSER]: Delete. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/m32r/config.in b/sim/m32r/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/m32r/config.in +++ b/sim/m32r/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/m32r/configure b/sim/m32r/configure index dea90b75052..00656213b91 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -8144,7 +8144,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8295,6 +8295,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10167,7 +10169,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12377,7 +12379,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12380 "configure" +#line 12382 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12483,7 +12485,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12486 "configure" +#line 12488 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12964,14 +12966,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h new file mode 100644 index 00000000000..a5c55d5fa32 --- /dev/null +++ b/sim/m32r/tconfig.h @@ -0,0 +1,38 @@ +/* M32R target configuration file. -*- C -*- */ + +#ifndef M32R_TCONFIG_H +#define M32R_TCONFIG_H + +/* Define this if the simulator can vary the size of memory. + See the xxx simulator for an example. + This enables the `-m size' option. + The memory size is stored in STATE_MEM_SIZE. */ +/* Not used for M32R since we use the memory module. */ +/* #define SIM_HAVE_MEM_SIZE */ + +/* See sim-hload.c. We properly handle LMA. */ +#define SIM_HANDLES_LMA 1 + +/* For MSPR support. FIXME: revisit. */ +#define WITH_DEVICES 1 + +#if 0 +/* Enable watchpoints. */ +#define WITH_WATCHPOINTS 1 +#endif + +/* Define this to enable the intrinsic breakpoint mechanism. */ +/* FIXME: may be able to remove SIM_HAVE_BREAKPOINT since it essentially + duplicates ifdef SIM_BREAKPOINT (right?) */ +#if 0 +#define SIM_HAVE_BREAKPOINTS +#define SIM_BREAKPOINT { 0x10, 0xf1 } +#define SIM_BREAKPOINT_SIZE 2 +#endif + +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. */ +#define WITH_SCACHE_PBB 1 + +#endif /* M32R_TCONFIG_H */ diff --git a/sim/m32r/tconfig.in b/sim/m32r/tconfig.in deleted file mode 100644 index a5c55d5fa32..00000000000 --- a/sim/m32r/tconfig.in +++ /dev/null @@ -1,38 +0,0 @@ -/* M32R target configuration file. -*- C -*- */ - -#ifndef M32R_TCONFIG_H -#define M32R_TCONFIG_H - -/* Define this if the simulator can vary the size of memory. - See the xxx simulator for an example. - This enables the `-m size' option. - The memory size is stored in STATE_MEM_SIZE. */ -/* Not used for M32R since we use the memory module. */ -/* #define SIM_HAVE_MEM_SIZE */ - -/* See sim-hload.c. We properly handle LMA. */ -#define SIM_HANDLES_LMA 1 - -/* For MSPR support. FIXME: revisit. */ -#define WITH_DEVICES 1 - -#if 0 -/* Enable watchpoints. */ -#define WITH_WATCHPOINTS 1 -#endif - -/* Define this to enable the intrinsic breakpoint mechanism. */ -/* FIXME: may be able to remove SIM_HAVE_BREAKPOINT since it essentially - duplicates ifdef SIM_BREAKPOINT (right?) */ -#if 0 -#define SIM_HAVE_BREAKPOINTS -#define SIM_BREAKPOINT { 0x10, 0xf1 } -#define SIM_BREAKPOINT_SIZE 2 -#endif - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. */ -#define WITH_SCACHE_PBB 1 - -#endif /* M32R_TCONFIG_H */ diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 6e10a382d12..712dcf9c457 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_RUN_OBJS): Delete. diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/m68hc11/config.in +++ b/sim/m68hc11/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 47a7e64da42..5b8524417f9 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -8289,6 +8289,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12371,7 +12373,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12374 "configure" +#line 12376 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12477,7 +12479,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12480 "configure" +#line 12482 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12958,14 +12960,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index 5d9fb6b5bb4..c3256f4f136 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CLEAN): Delete. diff --git a/sim/mcore/config.in b/sim/mcore/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/mcore/config.in +++ b/sim/mcore/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/mcore/configure b/sim/mcore/configure index 3785c2273b3..fa262774f0b 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index ceb1dd5b2c1..2c41a76038b 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Set to diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/microblaze/config.in +++ b/sim/microblaze/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/microblaze/configure b/sim/microblaze/configure index 3785c2273b3..fa262774f0b 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 2be47e0be2b..f8c349450d0 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in: Delete includes. diff --git a/sim/mips/config.in b/sim/mips/config.in index 83a39b54795..f5a103df6fc 100644 --- a/sim/mips/config.in +++ b/sim/mips/config.in @@ -174,3 +174,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/mips/configure b/sim/mips/configure index b2e164d433b..39c20b9cfdd 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -8318,6 +8318,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12400,7 +12402,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12403 "configure" +#line 12405 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12506,7 +12508,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12509 "configure" +#line 12511 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12987,14 +12989,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/mips/tconfig.h b/sim/mips/tconfig.h new file mode 100644 index 00000000000..95e66b4dad5 --- /dev/null +++ b/sim/mips/tconfig.h @@ -0,0 +1,27 @@ +/* mips target configuration file. */ + +/* See sim-hload.c. We properly handle LMA. */ +#ifdef TARGET_TX3904 +#define SIM_HANDLES_LMA 1 +#else +#define SIM_HANDLES_LMA 0 +#endif + +/* Define this if the simulator supports profiling. + See the mips simulator for an example. + This enables the `-p foo' and `-s bar' options. + The target is required to provide sim_set_profile{,_size}. */ +#define SIM_HAVE_PROFILE + +/* Define this if the simulator uses an instruction cache. + See the h8/300 simulator for an example. + This enables the `-c size' option to set the size of the cache. + The target is required to provide sim_set_simcache_size. */ +/* #define SIM_HAVE_SIMCACHE */ + +/* Define this if the target cpu is bi-endian + and the simulator supports it. */ +#define SIM_HAVE_BIENDIAN + +/* MIPS uses an unusual format for floating point quiet NaNs. */ +#define SIM_QUIET_NAN_NEGATED diff --git a/sim/mips/tconfig.in b/sim/mips/tconfig.in deleted file mode 100644 index 95e66b4dad5..00000000000 --- a/sim/mips/tconfig.in +++ /dev/null @@ -1,27 +0,0 @@ -/* mips target configuration file. */ - -/* See sim-hload.c. We properly handle LMA. */ -#ifdef TARGET_TX3904 -#define SIM_HANDLES_LMA 1 -#else -#define SIM_HANDLES_LMA 0 -#endif - -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -#define SIM_HAVE_PROFILE - -/* Define this if the simulator uses an instruction cache. - See the h8/300 simulator for an example. - This enables the `-c size' option to set the size of the cache. - The target is required to provide sim_set_simcache_size. */ -/* #define SIM_HAVE_SIMCACHE */ - -/* Define this if the target cpu is bi-endian - and the simulator supports it. */ -#define SIM_HAVE_BIENDIAN - -/* MIPS uses an unusual format for floating point quiet NaNs. */ -#define SIM_QUIET_NAN_NEGATED diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index aa9f5f1900b..bdf8b2cb04a 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-15 Mike Frysinger * tconfig.in: Delete file. diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in index 95f0aab3f5e..f6a87f12675 100644 --- a/sim/mn10300/config.in +++ b/sim/mn10300/config.in @@ -186,3 +186,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 435db0da5bc..9cba7697428 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -8294,6 +8294,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12376,7 +12378,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12379 "configure" +#line 12381 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12482,7 +12484,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12485 "configure" +#line 12487 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12963,14 +12965,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index bcdc1fa9ab6..f509fc019e5 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CLEAN): Delete. diff --git a/sim/moxie/config.in b/sim/moxie/config.in index b367e1429a7..6003e581c68 100644 --- a/sim/moxie/config.in +++ b/sim/moxie/config.in @@ -159,3 +159,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/moxie/configure b/sim/moxie/configure index 1542765a4cc..ccfdb771696 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -8281,6 +8281,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12363,7 +12365,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12366 "configure" +#line 12368 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12469,7 +12471,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12472 "configure" +#line 12474 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12950,14 +12952,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index d351d644487..5bcab325ce6 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * aclocal.m4, configure: Regenerate. diff --git a/sim/msp430/config.in b/sim/msp430/config.in index 03f7d91f124..df5c0d3591e 100644 --- a/sim/msp430/config.in +++ b/sim/msp430/config.in @@ -147,3 +147,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/msp430/configure b/sim/msp430/configure index 2ed37240ca9..af8b6bfd08f 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -8284,6 +8284,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12366,7 +12368,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12369 "configure" +#line 12371 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12472,7 +12474,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12475 "configure" +#line 12477 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,14 +12955,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index cd2914e1560..3c92412031a 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + 2014-08-19 Alan Modra * configure: Regenerate. diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/rl78/aclocal.m4 +++ b/sim/rl78/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/rl78/config.in b/sim/rl78/config.in index 03f7d91f124..df5c0d3591e 100644 --- a/sim/rl78/config.in +++ b/sim/rl78/config.in @@ -147,3 +147,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/rl78/configure b/sim/rl78/configure index 626b1eb05dc..752cbcbef09 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -8119,7 +8119,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10142,7 +10144,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index 8d4c4ec307c..90a36e04f08 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + 2015-12-15 Joel Brobecker * gdb-if.c (open): Rename to... diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/rx/aclocal.m4 +++ b/sim/rx/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/rx/config.in b/sim/rx/config.in index c510fbe8ff1..f7ccc45739f 100644 --- a/sim/rx/config.in +++ b/sim/rx/config.in @@ -153,3 +153,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/rx/configure b/sim/rx/configure index 40230647ade..7f5e70a9186 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -8123,7 +8123,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8274,6 +8274,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10146,7 +10148,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12356,7 +12358,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12359 "configure" +#line 12361 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12462,7 +12464,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12465 "configure" +#line 12467 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12943,14 +12945,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 8603da5b7f3..674a6768693 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_EXTRA_CFLAGS): Set to diff --git a/sim/sh/config.in b/sim/sh/config.in index 5fed8c1815b..5ded70312e7 100644 --- a/sim/sh/config.in +++ b/sim/sh/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/sh/configure b/sim/sh/configure index 3785c2273b3..fa262774f0b 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -8270,6 +8270,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/sh/tconfig.h b/sim/sh/tconfig.h new file mode 100644 index 00000000000..c5ec4fa2228 --- /dev/null +++ b/sim/sh/tconfig.h @@ -0,0 +1,17 @@ +/* sh target config file */ + +/* Define this if the simulator supports profiling. + See the mips simulator for an example. + This enables the `-p foo' and `-s bar' options. + The target is required to provide sim_set_profile{,_size}. */ +/* #define SIM_HAVE_PROFILE */ + +/* Define this if the simulator uses an instruction cache. + See the h8/300 simulator for an example. + This enables the `-c size' option to set the size of the cache. + The target is required to provide sim_set_simcache_size. */ +/* #define SIM_HAVE_SIMCACHE */ + +/* Define this if the target cpu is bi-endian + and the simulator supports it. */ +#define SIM_HAVE_BIENDIAN diff --git a/sim/sh/tconfig.in b/sim/sh/tconfig.in deleted file mode 100644 index c5ec4fa2228..00000000000 --- a/sim/sh/tconfig.in +++ /dev/null @@ -1,17 +0,0 @@ -/* sh target config file */ - -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -/* #define SIM_HAVE_PROFILE */ - -/* Define this if the simulator uses an instruction cache. - See the h8/300 simulator for an example. - This enables the `-c size' option to set the size of the cache. - The target is required to provide sim_set_simcache_size. */ -/* #define SIM_HAVE_SIMCACHE */ - -/* Define this if the target cpu is bi-endian - and the simulator supports it. */ -#define SIM_HAVE_BIENDIAN diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 20da758ccf9..ca0dee63954 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger + + * aclocal.m4, config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-15 Mike Frysinger * tconfig.in [HAVE_DV_SOCKSER]: Delete. diff --git a/sim/sh64/aclocal.m4 b/sim/sh64/aclocal.m4 index a24bbebfcab..517bc73b03b 100644 --- a/sim/sh64/aclocal.m4 +++ b/sim/sh64/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +71,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,7 +92,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -109,13 +108,13 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -124,7 +123,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) diff --git a/sim/sh64/config.in b/sim/sh64/config.in index 23fafeda9c4..bf39e2d8d28 100644 --- a/sim/sh64/config.in +++ b/sim/sh64/config.in @@ -165,3 +165,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/sh64/configure b/sim/sh64/configure index 18f98fb7fa9..c2982800b06 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -8142,7 +8142,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -8293,6 +8293,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -10165,7 +10167,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -12375,7 +12377,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12378 "configure" +#line 12380 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12481,7 +12483,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12484 "configure" +#line 12486 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12962,14 +12964,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h new file mode 100644 index 00000000000..9d64be9e703 --- /dev/null +++ b/sim/sh64/tconfig.h @@ -0,0 +1,39 @@ +/* SH64 target configuration file. -*- C -*- */ + +/* Define this if the simulator can vary the size of memory. + See the xxx simulator for an example. + This enables the `-m size' option. + The memory size is stored in STATE_MEM_SIZE. */ +/* Not used for SH64 since we use the memory module. TODO -- check this */ +/* #define SIM_HAVE_MEM_SIZE */ + +/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ +#define SIM_HANDLES_LMA 1 + +/* For MSPR support. FIXME: revisit. */ +#define WITH_DEVICES 0 + +#if 0 +/* Enable watchpoints. */ +#define WITH_WATCHPOINTS 1 +#endif + +/* ??? Temporary hack until model support unified. */ +#define SIM_HAVE_MODEL + +/* Define this to enable the intrinsic breakpoint mechanism. */ +/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially + duplicates ifdef SIM_BREAKPOINT (right?) */ +#if 1 +#define SIM_HAVE_BREAKPOINTS +#define SIM_BREAKPOINT { 0, 0, 0, 0xD } +#define SIM_BREAKPOINT_SIZE 4 +#endif + +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 1 + +/* Define this if the target cpu is bi-endian and the simulator supports it. */ +#define SIM_HAVE_BIENDIAN diff --git a/sim/sh64/tconfig.in b/sim/sh64/tconfig.in deleted file mode 100644 index 9d64be9e703..00000000000 --- a/sim/sh64/tconfig.in +++ /dev/null @@ -1,39 +0,0 @@ -/* SH64 target configuration file. -*- C -*- */ - -/* Define this if the simulator can vary the size of memory. - See the xxx simulator for an example. - This enables the `-m size' option. - The memory size is stored in STATE_MEM_SIZE. */ -/* Not used for SH64 since we use the memory module. TODO -- check this */ -/* #define SIM_HAVE_MEM_SIZE */ - -/* See sim-hload.c. We properly handle LMA. -- TODO: check this */ -#define SIM_HANDLES_LMA 1 - -/* For MSPR support. FIXME: revisit. */ -#define WITH_DEVICES 0 - -#if 0 -/* Enable watchpoints. */ -#define WITH_WATCHPOINTS 1 -#endif - -/* ??? Temporary hack until model support unified. */ -#define SIM_HAVE_MODEL - -/* Define this to enable the intrinsic breakpoint mechanism. */ -/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially - duplicates ifdef SIM_BREAKPOINT (right?) */ -#if 1 -#define SIM_HAVE_BREAKPOINTS -#define SIM_BREAKPOINT { 0, 0, 0, 0xD } -#define SIM_BREAKPOINT_SIZE 4 -#endif - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 1 - -/* Define this if the target cpu is bi-endian and the simulator supports it. */ -#define SIM_HAVE_BIENDIAN diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 8578b8a133e..853f9f718f9 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger * Makefile.in (SIM_RUN_OBJS): Delete. diff --git a/sim/v850/config.in b/sim/v850/config.in index b65100ecb10..f65e5c3edf9 100644 --- a/sim/v850/config.in +++ b/sim/v850/config.in @@ -180,3 +180,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/v850/configure b/sim/v850/configure index 7dce6d7d0e7..3c89c7f7696 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -8288,6 +8288,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12370,7 +12372,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12373 "configure" +#line 12375 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12476,7 +12478,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12479 "configure" +#line 12481 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12957,14 +12959,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;;