From dbb6088f89fe3cc22845097dc17f9f6a06682be1 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Wed, 20 May 2009 12:44:44 +0000 Subject: [PATCH] gstab.h (stab_code_type): Define, to be used instead of the __stab_debug_code enum, made anonymous. * gstab.h (stab_code_type): Define, to be used instead of the __stab_debug_code enum, made anonymous. Add 2009 to the copyright notice. * dbxout.c (STAB_CODE_TYPE): Remove #define and replace use occurrences by stab_code_type. * mips-tfile.c (STAB_CODE_TYPE): Remove #define, unused. From-SVN: r147734 --- gcc/ChangeLog | 9 +++++++++ gcc/dbxout.c | 12 +++++------- gcc/gstab.h | 7 +++++-- gcc/mips-tfile.c | 2 -- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0e39144b79cb..59721f496398 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2009-05-20 Olivier Hainque + + * gstab.h (stab_code_type): Define, to be used instead of the + __stab_debug_code enum, made anonymous. Add 2009 to the copyright + notice. + * dbxout.c (STAB_CODE_TYPE): Remove #define and replace use + occurrences by stab_code_type. + * mips-tfile.c (STAB_CODE_TYPE): Remove #define, unused. + 2009-05-20 Martin Jambor * tree-flow.h (insert_edge_copies_seq): Undeclare. diff --git a/gcc/dbxout.c b/gcc/dbxout.c index eb0fceee52b6..9ec0525d9591 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -275,8 +275,6 @@ static const char *base_input_file; #include "gstab.h" -#define STAB_CODE_TYPE enum __stab_debug_code - /* 1 if PARM is passed to this function in memory. */ #define PARM_PASSED_IN_MEMORY(PARM) \ @@ -326,7 +324,7 @@ static void dbxout_type_name (tree); static void dbxout_class_name_qualifiers (tree); static int dbxout_symbol_location (tree, tree, const char *, rtx); static void dbxout_symbol_name (tree, const char *, int); -static void dbxout_common_name (tree, const char *, STAB_CODE_TYPE); +static void dbxout_common_name (tree, const char *, stab_code_type); static const char *dbxout_common_check (tree, int *); static void dbxout_global_decl (tree); static void dbxout_type_decl (tree, int); @@ -842,7 +840,7 @@ do { \ to DBX_FINISH_STABS; see above for details. */ static void -dbxout_finish_complex_stabs (tree sym, STAB_CODE_TYPE code, +dbxout_finish_complex_stabs (tree sym, stab_code_type code, rtx addr, const char *label, int number) { int line ATTRIBUTE_UNUSED; @@ -2852,7 +2850,7 @@ static int dbxout_symbol_location (tree decl, tree type, const char *suffix, rtx home) { int letter = 0; - STAB_CODE_TYPE code; + stab_code_type code; rtx addr = 0; int number = 0; int regno = -1; @@ -3157,7 +3155,7 @@ dbxout_symbol_name (tree decl, const char *suffix, int letter) emits the N_BCOMM and N_ECOMM stabs. */ static void -dbxout_common_name (tree decl, const char *name, STAB_CODE_TYPE op) +dbxout_common_name (tree decl, const char *name, stab_code_type op) { dbxout_begin_complex_stabs (); stabstr_S (name); @@ -3325,7 +3323,7 @@ dbxout_parms (tree parms) { tree eff_type; char letter; - STAB_CODE_TYPE code; + stab_code_type code; int number; /* Perform any necessary register eliminations on the parameter's rtl, diff --git a/gcc/gstab.h b/gcc/gstab.h index 7f82b55ec10b..fccb296cd9a4 100644 --- a/gcc/gstab.h +++ b/gcc/gstab.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -21,12 +21,15 @@ along with GCC; see the file COPYING3. If not see #define __define_stab(NAME, CODE, STRING) NAME=CODE, -enum __stab_debug_code +enum { #include "stab.def" LAST_UNUSED_STAB_CODE }; +/* stabs debug codes really are integers with expressive names. */ +typedef int stab_code_type; + #undef __define_stab #endif /* ! GCC_GSTAB_H */ diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c index 4bd716eb4b92..07d229e672cc 100644 --- a/gcc/mips-tfile.c +++ b/gcc/mips-tfile.c @@ -675,8 +675,6 @@ main (void) #include "gstab.h" -#define STAB_CODE_TYPE enum __stab_debug_code - #ifndef MALLOC_CHECK #ifdef __SABER__ #define MALLOC_CHECK