This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Make register name tables in visium.h static in order to prevent multiple definitions.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7bdf96efeede567ac4b8cd3fdaa665c0e5ba4785

commit 7bdf96efeede567ac4b8cd3fdaa665c0e5ba4785
Author: Nick Clifton <nickc@redhat.com>
Date:   Wed Sep 9 14:50:08 2015 +0100

    Make register name tables in visium.h static in order to prevent multiple definitions.
    
    	* visium.h (gen_reg_table): Make static.
    	(fp_reg_table): Likewise.
    	(cc_table): Likewise.

Diff:
---
 include/opcode/ChangeLog | 6 ++++++
 include/opcode/visium.h  | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 7e44d68..6fce0ac 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-09  Daniel Santos  <daniel.santos@pobox.com>
+
+	* visium.h (gen_reg_table): Make static.
+	(fp_reg_table): Likewise.
+	(cc_table): Likewise.
+
 2015-07-20  Matthew Wahab  <matthew.wahab@arm.com>
 
 	* arm.h (ARM_AEXT_V6ZK): Rename to ARM_AEXT_V6KZ.
diff --git a/include/opcode/visium.h b/include/opcode/visium.h
index c6048c9..f3704c3 100644
--- a/include/opcode/visium.h
+++ b/include/opcode/visium.h
@@ -104,7 +104,7 @@ struct reg_entry
   unsigned char code;
 };
 
-const struct reg_entry gen_reg_table[] =
+static const struct reg_entry gen_reg_table[] =
 {
   {"fp", 0x16},
   {"r0", 0x0},
@@ -142,7 +142,7 @@ const struct reg_entry gen_reg_table[] =
   {"sp", 0x17},
 };
 
-const struct reg_entry fp_reg_table[] =
+static const struct reg_entry fp_reg_table[] =
 {
   {"f0", 0x0},
   {"f1", 0x1},
@@ -162,7 +162,7 @@ const struct reg_entry fp_reg_table[] =
   {"f9", 0x9},
 };
 
-const struct cc_entry
+static const struct cc_entry
 {
   char *name;
   int code;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]