OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: avoid TRACE redefine warnings 

The common code sets up an autoconf option --enable-sim-trace which adds
-DTRACE= to CPPFLAGS.  This causes warnings in the building of some files
that declare a local TRACE() helper macro.  So punt it from hw-ports.c
(since it isn't actually used) and convert hw-properties.c to HW_TRACE().
This commit is contained in:
Mike Frysinger 2010-03-16 20:58:53 +00:00
parent bbb0eef699
commit 6d519a4606
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sim/common/ChangeLog
View File

@ -1,3 +1,12 @@
2010-03-16 Mike Frysinger <vapier@gentoo.org>
* hw-ports.c (TRACE): Delete.
* hw-properties.c (TRACE): Delete.
(hw_find_ihandle_runtime_property): Change TRACE to HW_TRACE.
(hw_find_integer_property): Likewise.
(hw_find_integer_array_property): Likewise.
(hw_add_duplicate_property): Likewise.
2010-03-15 Mike Frysinger <vapier@gentoo.org>
* hw-properties.h (hw_add_boolean_property): Rename "bool" to

2
sim/common/hw-ports.c
View File

@ -35,8 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <ctype.h>
#define TRACE(x,y)
struct hw_port_edge {
int my_port;

18
sim/common/hw-properties.c
View File

@ -33,8 +33,6 @@
#endif
#endif
#define TRACE(A,B)
/* property entries */
struct hw_property_data {
@ -418,9 +416,7 @@ hw_find_ihandle_runtime_property (struct hw *me,
ihandle_runtime_property_spec *ihandle)
{
struct hw_property_data *entry = find_property_data (me, property);
TRACE (trace_devices,
("hw_find_ihandle_runtime_property(me=0x%lx, property=%s)\n",
(long)me, property));
HW_TRACE ((me, "hw_find_ihandle_runtime_property(property=%s)\n", property));
if (entry == NULL)
hw_abort (me, "property \"%s\" not found", property);
if (entry->property->type != ihandle_property
@ -492,9 +488,7 @@ hw_find_integer_property (struct hw *me,
{
const struct hw_property *node;
signed_cell integer;
TRACE (trace_devices,
("hw_find_integer(me=0x%lx, property=%s)\n",
(long)me, property));
HW_TRACE ((me, "hw_find_integer(property=%s)\n", property));
node = hw_find_property (me, property);
if (node == NULL)
hw_abort (me, "property \"%s\" not found", property);
@ -514,9 +508,7 @@ hw_find_integer_array_property (struct hw *me,
const struct hw_property *node;
int sizeof_integer = sizeof (*integer);
signed_cell *cell;
TRACE (trace_devices,
("hw_find_integer(me=0x%lx, property=%s)\n",
(long)me, property));
HW_TRACE ((me, "hw_find_integer(property=%s)\n", property));
/* check things sane */
node = hw_find_property (me, property);
@ -886,9 +878,7 @@ hw_add_duplicate_property (struct hw *me,
const struct hw_property *original)
{
struct hw_property_data *master;
TRACE (trace_devices,
("hw_add_duplicate_property(me=0x%lx, property=%s, ...)\n",
(long)me, property));
HW_TRACE ((me, "hw_add_duplicate_property(property=%s, ...)\n", property));
if (original->disposition != permenant_object)
hw_abort (me, "Can only duplicate permenant objects");
/* find the original's master */