diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-01-09 04:00:53 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-10 02:54:59 -0500 |
| commit | 22be3fbeaccf50e3c0f58d0f7e9f7ed77effeaab (patch) | |
| tree | bb7933fd15e5c4c05fd24fa3c1e01197789f8a89 /sim/common | |
| parent | 7124407794aaa3762a25c26cd3a00a637f7241c9 (diff) | |
| download | binutils-gdb-22be3fbeaccf50e3c0f58d0f7e9f7ed77effeaab.tar.gz | |
sim: drop --enable-sim-cflags option
No other sub directory provides such a configuration option, so
drop it from the sim dir as well. This cleans up a good bit of
code in the process.
If people want to use custom flags for just the sim, they can
still run configure+make by hand in the sim subdir and use the
normal CFLAGS settings.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 2 | ||||
| -rw-r--r-- | sim/common/Makefile.in | 3 | ||||
| -rw-r--r-- | sim/common/acinclude.m4 | 15 |
4 files changed, 8 insertions, 19 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 42f37676cf2..27ca374493d 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,10 @@ +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * acinclude.m4: Delete --enable-sim-cflags and sim_cflags. + * Make-common.in (SIM_CFLAGS): Delete. + (CONFIG_CFLAGS): Delete $(SIM_CFLAGS). + * Makefile.in: Likewise. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * configure.ac: Change SIM_AC_COMMON to AC_PROG_CC. Drop 2nd arg diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 30844cc241b..a90d3d80516 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -75,7 +75,6 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ -SIM_CFLAGS = @sim_cflags@ SIM_DEBUG = @sim_debug@ SIM_TRACE = @sim_trace@ SIM_PROFILE = @sim_profile@ @@ -228,7 +227,6 @@ CGEN_INCLUDE_DEPS = \ CONFIG_CFLAGS = \ @DEFS@ \ - $(SIM_CFLAGS) \ $(SIM_DEBUG) \ $(SIM_DEFAULT_MODEL) \ $(SIM_TRACE) \ diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in index c249b4b83b6..0f934ce048f 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -48,7 +48,6 @@ INSTALL_DATA = @INSTALL_DATA@ CC = @CC@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -SIM_CFLAGS = @sim_cflags@ # These are used to rebuild nltvals.def. CPP_FOR_TARGET = @CPP_FOR_TARGET@ @@ -57,7 +56,7 @@ TARGET_SUBDIR = @TARGET_SUBDIR@ HDEFINES = @HDEFINES@ TDEFINES = -CONFIG_CFLAGS = @DEFS@ $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) +CONFIG_CFLAGS = @DEFS@ $(HDEFINES) $(TDEFINES) CSEARCH = -I. -I$(srcdir) -I$(srcroot)/include ALL_CFLAGS = $(CFLAGS) $(CONFIG_CFLAGS) $(CSEARCH) BUILD_CFLAGS = -g -O $(CSEARCH) diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index a746ca8b618..e11e568a006 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -133,21 +133,6 @@ dnl --enable-maintainer-mode. AM_MAINTAINER_MODE -AC_ARG_ENABLE(sim-cflags, -[AS_HELP_STRING([--enable-sim-cflags=opts], - [Extra CFLAGS for use in building simulator])], -[case "${enableval}" in - yes) sim_cflags="-O2 -fomit-frame-pointer";; - trace) AC_MSG_ERROR("Please use --enable-sim-debug instead."); sim_cflags="";; - no) sim_cflags="";; - *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;; -esac -if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then - echo "Setting sim cflags = $sim_cflags" 6>&1 -fi],[sim_cflags=""])dnl -AC_SUBST(sim_cflags) - - dnl --enable-sim-debug is for developers of the simulator dnl the allowable values are work-in-progress AC_ARG_ENABLE(sim-debug, |