[RFA,32/42] Remove EXTERN from buildsym.h

Message ID 20180523045851.11660-33-tom@tromey.com
State New, archived
Headers

Commit Message

Tom Tromey May 23, 2018, 4:58 a.m. UTC
  Nothing in buildsym.h relies on the "EXTERN" method of
declaration/definition, so remove the traces.

gdb/ChangeLog
2018-05-22  Tom Tromey  <tom@tromey.com>

	* buildsym.h (EXTERN): Don't define or undef.
	* buildsym.c (EXTERN): Don't define.
---
 gdb/ChangeLog  |  5 +++++
 gdb/buildsym.c |  7 +------
 gdb/buildsym.h | 13 +------------
 3 files changed, 7 insertions(+), 18 deletions(-)
  

Comments

Simon Marchi July 10, 2018, 3:43 a.m. UTC | #1
On 2018-05-23 12:58 AM, Tom Tromey wrote:
> Nothing in buildsym.h relies on the "EXTERN" method of
> declaration/definition, so remove the traces.

LGTM.
  

Patch

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index a39c003e7c..1c7b3de215 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -62,6 +62,7 @@ 
 */
 
 #include "defs.h"
+#include "buildsym.h"
 #include "bfd.h"
 #include "gdb_obstack.h"
 #include "symtab.h"
@@ -79,12 +80,6 @@ 
 #include "addrmap.h"
 #include <algorithm>
 
-/* Ask buildsym.h to define the vars it normally declares `extern'.  */
-#define	EXTERN
-/**/
-#include "buildsym.h"		/* Our own declarations.  */
-#undef	EXTERN
-
 /* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat
    questionable--see comment where we call them).  */
 
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index b6d16876d6..8a4f47b375 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -30,22 +30,13 @@  enum language;
    file-reading routines.
 
    They originated in dbxread.c of gdb-4.2, and were split out to
-   make xcoffread.c more maintainable by sharing code.
-
-   Variables declared in this file can be defined by #define-ing the
-   name EXTERN to null.  It is used to declare variables that are
-   normally extern, but which get defined in a single module using
-   this technique.  */
+   make xcoffread.c more maintainable by sharing code.  */
 
 struct block;
 struct pending_block;
 
 struct dynamic_prop;
 
-#ifndef EXTERN
-#define	EXTERN extern
-#endif
-
 /* The list of sub-source-files within the current individual
    compilation.  Each file gets its own symtab with its own linetable
    and associated info, but they all share one blockvector.  */
@@ -271,6 +262,4 @@  extern struct pending **get_file_symbols ();
 
 extern struct pending **get_global_symbols ();
 
-#undef EXTERN
-
 #endif /* defined (BUILDSYM_H) */