diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-06-12 10:32:54 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-06-12 10:40:46 -0400 |
| commit | a34870829162e3276a9e0152efe2c7de5677a0c3 (patch) | |
| tree | 400109c3d67ffb1a09a09b2126284e28cf15703a /sim/common | |
| parent | 5b064994f0e7d8a7bfa0b4b080a360ecd9d2af82 (diff) | |
| download | gdb-a34870829162e3276a9e0152efe2c7de5677a0c3.zip gdb-a34870829162e3276a9e0152efe2c7de5677a0c3.tar.gz gdb-a34870829162e3276a9e0152efe2c7de5677a0c3.tar.bz2 | |
sim: drop -DTRACE from configure
No code uses this anymore and the symbol conflicts with the new TRACE
helper. Punt it from configure.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/acinclude.m4 | 6 | ||||
| -rwxr-xr-x | sim/common/configure | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index bb26a2f..24e266d 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,10 @@ 2015-06-12 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (sim-trace): Delete -DTRACE flags. + * configure: Regenerate. + +2015-06-12 Mike Frysinger <vapier@gentoo.org> + * sim-trace.h (TRACE, TRACE_INSN, TRACE_DECODE, TRACE_EXTRACT, TRACE_LINENUM, TRACE_MEMORY, TRACE_MODEL, TRACE_ALU, TRACE_CORE, TRACE_EVENTS, TRACE_FPU, TRACE_VPU, TRACE_BRANCH, TRACE_SYSCALL, diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 75ea8ea..3564474 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -186,10 +186,10 @@ dnl use WITH_TRACE. AC_ARG_ENABLE(sim-trace, [ --enable-sim-trace=opts Enable tracing flags], [case "${enableval}" in - yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";; - no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";; + yes) sim_trace="-DWITH_TRACE=-1";; + no) sim_trace="-DWITH_TRACE=0";; [[-0-9]]*) - sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";; + sim_trace="-DWITH_TRACE='(${enableval})'";; [[[:lower:]]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do diff --git a/sim/common/configure b/sim/common/configure index 631ebac..96edf37 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -11002,10 +11002,10 @@ fi # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";; - no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";; + yes) sim_trace="-DWITH_TRACE=-1";; + no) sim_trace="-DWITH_TRACE=0";; [-0-9]*) - sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";; + sim_trace="-DWITH_TRACE='(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do |