diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-02-19 03:46:01 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-14 07:02:58 -0400 |
| commit | 465fb143c87076b6416a8d0d5dd79bb016060fe3 (patch) | |
| tree | d630acdd9e0001b0e6e988d34b72c827c26cc28e /sim/common | |
| parent | b9005ba76ee501a809f2657b04bb2f2590829fa3 (diff) | |
| download | fsf-binutils-gdb-465fb143c87076b6416a8d0d5dd79bb016060fe3.zip fsf-binutils-gdb-465fb143c87076b6416a8d0d5dd79bb016060fe3.tar.gz fsf-binutils-gdb-465fb143c87076b6416a8d0d5dd79bb016060fe3.tar.bz2 | |
sim: make nrun the default run program
We want people to stop using the run.c frontend, but it's hard to notice
when it's still set as the default. Lets flip things so nrun.c is the
default, and users of run.c will get an error by default. We turn that
error into a warning for existing sims so we don't break them -- this is
mostly meant for people starting new ports.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 2 | ||||
| -rw-r--r-- | sim/common/run.c | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 95ae4a4..60d4ba5 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,11 @@ 2015-03-14 Mike Frysinger <vapier@gentoo.org> + * Make-common.in (SIM_RUN_OBJS): Change to nrun.o. + * run.c [SIM_USE_DEPRECATED_RUN_FRONTEND]: Issue a warning. + [!SIM_USE_DEPRECATED_RUN_FRONTEND]: Throw an error. + +2015-03-14 Mike Frysinger <vapier@gentoo.org> + * sim-assert.h [!SIM_ASSERT, WITH_ASSERT]: Include sim-io.h. [!ASSERT, WITH_ASSERT]: Likewise. * sim-endian.c: Delete sim-io.h include. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 1d721cd..2004abb 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -139,7 +139,7 @@ SIM_EXTRA_LIBS = # List of extra program dependencies. SIM_EXTRA_LIBDEPS = # List of main object files for `run'. -SIM_RUN_OBJS = run.o +SIM_RUN_OBJS = nrun.o # Dependency of `all' to build any extra files. SIM_EXTRA_ALL = # Dependency of `install' to install any extra files. diff --git a/sim/common/run.c b/sim/common/run.c index 35bb4e1..e474661 100644 --- a/sim/common/run.c +++ b/sim/common/run.c @@ -50,6 +50,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "run-sim.h" #include "version.h" +#ifdef SIM_USE_DEPRECATED_RUN_FRONTEND +# warning "This sim is using the deprecated run.c; please migrate to nrun.c." +#else +# error "Please do not create new sim ports using run.c; use nrun.c instead." \ + "New submissions using run.c will not be accepted." +#endif + static void usage (int help); static void print_version (void); extern int optind; |