diff options
| author | Stafford Horne <shorne@gmail.com> | 2019-03-28 06:40:30 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2019-03-28 06:40:30 +0900 |
| commit | ef9866970ce6683d40465fb7c3168f87a1dcd1b7 (patch) | |
| tree | 1a7929efbdea522520c1ba5fbeca66cf95c5c554 /sim/common/Make-common.in | |
| parent | 20dc7e9b059edff1d0fab3bd197c460c11cc7a06 (diff) | |
| download | gdb-ef9866970ce6683d40465fb7c3168f87a1dcd1b7.zip gdb-ef9866970ce6683d40465fb7c3168f87a1dcd1b7.tar.gz gdb-ef9866970ce6683d40465fb7c3168f87a1dcd1b7.tar.bz2 | |
sim/common: convert sim-arange to use sim-inline
This fixes a TODO item and also fixes an error which we get when
building with no optimizations (-O0) in at least gcc 8.2.1.
Tested with sims that use cgen code lm32, or1k, cris, m32r and inlining
is working corretly.
Reference Error:
gcc -DHAVE_CONFIG_H -DWITH_DEFAULT_MODEL='"or1200"' -DWITH_ALIGNMENT=STRICT_ALIGNMENT \
-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -DWITH_TARGET_ADDRESS_BITSIZE=32 \
-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_BIG -DDEFAULT_INLINE=0 -DWITH_SCACHE=16384 \
-I. -I../../../binutils-gdb/sim/or1k -I../common -I../../../binutils-gdb/sim/or1k/../common \
-I../../include -I../../../binutils-gdb/sim/or1k/../../include -I../../bfd \
-I../../../binutils-gdb/sim/or1k/../../bfd -I../../opcodes -I../../../binutils-gdb/sim/or1k/../../opcodes \
-g -o run nrun.o libsim.a ../../bfd/libbfd.a ../../opcodes/libopcodes.a ../../libiberty/libiberty.a \
-ldl -lz -lm
/usr/bin/ld: libsim.a(mloop.o): in function `extract':
/home/shorne/work/openrisc/gdb-musl/sim/or1k/mloop.c:82: undefined reference to `sim_addr_range_hit_p'
/usr/bin/ld: /home/shorne/work/openrisc/gdb-musl/sim/or1k/mloop.c:83: undefined reference to `sim_addr_range_hit_p'
collect2: error: ld returned 1 exit status
make[3]: *** [Makefile:305: run] Error 1
sim/common/ChangeLog:
* Make-common.in (sim-arange_h): Remove sim-arange.c
* sim-arange.c: Remove SIM_ARANGE_C.
Add ifdef for _SIM_ARANGE_C_.
Include "sim-arange.h".
Remove include for unused "sim-assert.h".
Remove DEFINE_INLINE_P. Remove DEFINE_NON_INLINE_P.
(sim_addr_range_add): Declare as INLINE_SIM_ARANGE.
(sim_addr_range_delete): Declare as INLINE_SIM_ARANGE.
(sim_addr_range_hit_p): Change from SIM_ARANGE_INLINE to
INLINE_SIM_ARANGE.
* sim-arange.h (sim_addr_range_add): Declare as
INLINE_SIM_ARANGE.
(sim_addr_range_delete): Declare as INLINE_SIM_ARANGE.
(sim_addr_range_hit_p) Declare as INLINE_SIM_ARANGE.
Remove definition of SIM_ARANGE_INLINE.
Remove [HAVE_INLINE].
Wrap include "sim-arange.c" in H_REVEALS_MODULE_P.
* sim-base.h: Include "sim-arange.h"
* sim-basics.h: Remove include of "sim-arange.h"
* sim-inline.c: Include "sim-arange.c"
* sim-inline.h: Define INLINE_SIM_ARANGE.
Define SIM_ARANGE_INLINE. Define EXTERN_SIM_ARANGE_P.
Define STATIC_INLINE_SIM_ARANGE. Define STATIC_SIM_ARANGE.
Diffstat (limited to 'sim/common/Make-common.in')
| -rw-r--r-- | sim/common/Make-common.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 1a3bcc9..5d8ac91 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -319,8 +319,7 @@ SIM_MAIN_DEPS = \ $(sim_main_headers) sim-alu_h = $(srccom)/sim-alu.h -sim-arange_h = $(srccom)/sim-arange.h \ - $(srccom)/sim-arange.c +sim-arange_h = $(srccom)/sim-arange.h sim-assert_h = $(srccom)/sim-assert.h sim-base_h = $(srccom)/sim-base.h \ $(sim-module_h) \ |