Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdb: Remove some C compiler support leftovers

Browse Source 
Remove some __cplusplus checks, inline EXPORTED_CONST, and update some comments.

gdb/ChangeLog:
2016-10-06  Pedro Alves  <palves@redhat.com>

	* cp-valprint.c (vtbl_ptr_name): Write "extern const" instead of
	EXPORTED_CONST.
	* stub-termcap.c: Remove __cplusplus checks.
	* common/common-defs.h [!__cplusplus] (EXTERN_C, EXTERN_C_PUSH,
	EXTERN_C_POP): Delete.
	* common/common-exceptions.h (GDB_XCPT_SJMP): Update comments.
	(GDB_XCPT) [!__cplusplus]: Delete.
	(throw_exception, throw_exception_sjlj): Update comments.
	* guile/guile-internal.h (as_a_scm_t_subr) [!__cplusplus]: Delete.
	* guile/guile.c (extension_language_guile): Write "extern const"
	instead of EXPORTED_CONST.
	* features/feature_to_c.sh: Don't emit !__cplusplus code.  Write
	"extern const" instead of EXPORTED_CONST.
This commit is contained in:
Pedro Alves
2016-10-06 19:23:37 +01:00
parent 33fa2c6e1b
commit ddb6d63387
8 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdb/ChangeLog
View File

@@ -1,3 +1,19 @@
2016-10-06 Pedro Alves <palves@redhat.com>
* cp-valprint.c (vtbl_ptr_name): Write "extern const" instead of
EXPORTED_CONST.
* stub-termcap.c: Remove __cplusplus checks.
* common/common-defs.h [!__cplusplus] (EXTERN_C, EXTERN_C_PUSH,
EXTERN_C_POP): Delete.
* common/common-exceptions.h (GDB_XCPT_SJMP): Update comments.
(GDB_XCPT) [!__cplusplus]: Delete.
(throw_exception, throw_exception_sjlj): Update comments.
* guile/guile-internal.h (as_a_scm_t_subr) [!__cplusplus]: Delete.
* guile/guile.c (extension_language_guile): Write "extern const"
instead of EXPORTED_CONST.
* features/feature_to_c.sh: Don't emit !__cplusplus code. Write
"extern const" instead of EXPORTED_CONST.
2016-10-06 Doug Evans <dje@google.com>
* python/py-value.c (valpy_long): Handle unsigned values.

12
gdb/common/common-defs.h
View File

@@ -75,14 +75,8 @@
#include "cleanups.h"
#include "common-exceptions.h"
#ifdef __cplusplus
# define EXTERN_C extern "C"
# define EXTERN_C_PUSH extern "C" {
# define EXTERN_C_POP }
#else
# define EXTERN_C extern
# define EXTERN_C_PUSH
# define EXTERN_C_POP
#endif
#define EXTERN_C extern "C"
#define EXTERN_C_PUSH extern "C" {
#define EXTERN_C_POP }
#endif /* COMMON_DEFS_H */

23
gdb/common/common-exceptions.h
View File

@@ -119,8 +119,7 @@ struct gdb_exception
/* The different exception mechanisms that TRY/CATCH can map to. */
/* Make GDB exceptions use setjmp/longjmp behind the scenes. This is
the only mode supported when GDB is built as a C program. */
/* Make GDB exceptions use setjmp/longjmp behind the scenes. */
#define GDB_XCPT_SJMP 1
/* Make GDB exceptions use try/catch behind the scenes. */
@@ -132,11 +131,7 @@ struct gdb_exception
spurious code between the TRY and the CATCH block. */
#define GDB_XCPT_RAW_TRY 3
#ifdef __cplusplus
# define GDB_XCPT GDB_XCPT_TRY
#else
# define GDB_XCPT GDB_XCPT_SJMP
#endif
#define GDB_XCPT GDB_XCPT_TRY
/* Functions to drive the sjlj-based exceptions state machine. Though
declared here by necessity, these functions should be considered
@@ -305,18 +300,16 @@ struct gdb_quit_bad_alloc
/* *INDENT-ON* */
/* Throw an exception (as described by "struct gdb_exception"). When
GDB is built as a C program, executes a LONG JUMP to the inner most
containing exception handler established using TRY/CATCH. When
built as a C++ program, throws a C++ exception, using "throw". */
/* Throw an exception (as described by "struct gdb_exception"),
landing in the inner most containing exception handler established
using TRY/CATCH. */
extern void throw_exception (struct gdb_exception exception)
ATTRIBUTE_NORETURN;
/* Throw an exception by executing a LONG JUMP to the inner most
containing exception handler established using TRY_SJLJ. Works the
same regardless of whether GDB is built as a C program or a C++
program. Necessary in some cases where we need to throw GDB
exceptions across third-party library code (e.g., readline). */
containing exception handler established using TRY_SJLJ. Necessary
in some cases where we need to throw GDB exceptions across
third-party library code (e.g., readline). */
extern void throw_exception_sjlj (struct gdb_exception exception)
ATTRIBUTE_NORETURN;

2
gdb/cp-valprint.c
View File

@@ -88,7 +88,7 @@ static void cp_print_value (struct type *, struct type *,
/* GCC versions after 2.4.5 use this. */
EXPORTED_CONST char vtbl_ptr_name[] = "__vtbl_ptr_type";
extern const char vtbl_ptr_name[] = "__vtbl_ptr_type";
/* Return truth value for assertion that TYPE is of the type
"pointer to virtual function". */

7
gdb/features/feature_to_c.sh
View File

@@ -64,12 +64,7 @@ done
echo >> $output
echo "#ifdef __cplusplus" >> $output
echo "# define EXPORTED_CONST extern const" >> $output
echo "#else" >> $output
echo "# define EXPORTED_CONST const" >> $output
echo "#endif" >> $output
echo "EXPORTED_CONST char *const xml_builtin[][2] = {" >> $output
echo "extern const char *const xml_builtin[][2] = {" >> $output
for input; do
basename=`echo $input | sed 's,.*/,,'`

8
gdb/guile/guile-internal.h
View File

@@ -50,8 +50,6 @@ typedef struct
#define END_VARIABLES { NULL, SCM_BOOL_F, NULL }
#ifdef __cplusplus
/* Although scm_t_subr is meant to hold a function pointer, at least
in some versions of guile, it is actually a typedef to "void *".
That means that in C++, an explicit cast is necessary to convert
@@ -88,12 +86,6 @@ as_a_scm_t_subr (SCM (*func) (SCM, SCM, SCM))
return (scm_t_subr) func;
}
#else
/* In C, just do an implicit conversion. */
#define as_a_scm_t_subr(func) func
#endif
/* Scheme functions to define during initialization. */
typedef struct

2
gdb/guile/guile.c
View File

@@ -77,7 +77,7 @@ extern const struct extension_language_ops guile_extension_ops;
/* The main struct describing GDB's interface to the Guile
extension language. */
EXPORTED_CONST struct extension_language_defn extension_language_guile =
extern const struct extension_language_defn extension_language_guile =
{
EXT_LANG_GUILE,
"guile",

4
gdb/stub-termcap.c
View File

@@ -22,9 +22,7 @@
#include "defs.h"
#ifdef __cplusplus
extern "C" {
#endif
/* -Wmissing-prototypes */
extern int tgetent (char *buffer, char *termtype);
@@ -34,9 +32,7 @@ extern char* tgetstr (char *name, char **area);
extern int tputs (char *string, int nlines, int (*outfun) (int));
extern char *tgoto (const char *cap, int col, int row);
#ifdef __cplusplus
}
#endif
/* These globals below are global termcap variables that readline
references.