From ae7d0cac8ce971f7108d270c1d3f8481919b1e86 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 14 Mar 2015 23:41:25 -0400 Subject: 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. --- sim/cris/ChangeLog | 7 +++++++ sim/cris/aclocal.m4 | 17 ++++++++--------- sim/cris/config.in | 2 ++ sim/cris/configure | 18 ++++++------------ sim/cris/rvdummy.c | 1 - sim/cris/tconfig.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ sim/cris/tconfig.in | 44 -------------------------------------------- 7 files changed, 67 insertions(+), 66 deletions(-) create mode 100644 sim/cris/tconfig.h delete mode 100644 sim/cris/tconfig.in (limited to 'sim/cris') diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 9432e32..d2f912d 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 a24bbeb..517bc73 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 05c2fde..c333731 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 610da55..7c9094e 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 6e2e092..f788686 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 0000000..8f82ac7 --- /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 8f82ac7..0000000 --- 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 */ -- cgit v1.1