aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-03-09 11:58:10 +0000
committerPedro Alves <palves@redhat.com>2015-08-06 17:44:08 +0100
commit33ebda9d6841e18d9ef18b94c3dcad7d0498ab3d (patch)
tree82384e6b7a8c845f56ab146ba55534b3fab37550
parenta44892be35506471a53e5bc8c2def4ffccf451f9 (diff)
downloadgdb-33ebda9d6841e18d9ef18b94c3dcad7d0498ab3d.zip
gdb-33ebda9d6841e18d9ef18b94c3dcad7d0498ab3d.tar.gz
gdb-33ebda9d6841e18d9ef18b94c3dcad7d0498ab3d.tar.bz2
gdbserver/tracepoint.c: make exported IPA global int instead of enum
Fixes another C++ -fpermissive error: src/gdb/gdbserver/tracepoint.c:4535:21: error: invalid conversion from ‘int’ to ‘eval_result_type’ [-fpermissive] expr_eval_result = ipa_expr_eval_result; gdb/gdbserver/ChangeLog: 2015-08-06 Pedro Alves <palves@redhat.com> * tracepoint.c (expr_eval_result): Now an int.
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/tracepoint.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 5f08417..4f64e43 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@
2015-08-06 Pedro Alves <palves@redhat.com>
+ * tracepoint.c (expr_eval_result): Now an int.
+
+2015-08-06 Pedro Alves <palves@redhat.com>
+
* gdbthread.h (struct regcache): Forward declare.
(struct thread_info) <regcache_data>: Now a struct regcache
pointer.
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index e1c4a45..4455084 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -848,7 +848,10 @@ IP_AGENT_EXPORT_VAR int trace_buffer_is_full;
/* The first error that occurred during expression evaluation. */
-IP_AGENT_EXPORT_VAR enum eval_result_type expr_eval_result = expr_eval_no_error;
+/* Stored as an int to avoid the IPA ABI being dependent on whatever
+ the compiler decides to use for the enum's underlying type. Holds
+ enum eval_result_type values. */
+IP_AGENT_EXPORT_VAR int expr_eval_result = expr_eval_no_error;
EXTERN_C_POP