diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-14 23:41:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-16 01:23:52 -0400 |
| commit | ae7d0cac8ce971f7108d270c1d3f8481919b1e86 (patch) | |
| tree | 922127997fda3de2483ed896fba8ae88576bba5e /sim/common/acinclude.m4 | |
| parent | 9c5f41df36176d86afa65fc9b69b8fd6f6044547 (diff) | |
| download | gdb-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.zip gdb-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.tar.gz gdb-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.tar.bz2 | |
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.
Diffstat (limited to 'sim/common/acinclude.m4')
| -rw-r--r-- | sim/common/acinclude.m4 | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index f96ec35..2e1d31f 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 ;; |