espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-10 23:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename DEBUG to SYMBIAN_DEBUG to avoid conflicts with global DEBUG definition

Browse Source
This commit is contained in:
Nick Clifton
2006-05-02 09:56:00 +00:00
parent 22772e33f6
commit 63f2fc3083
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2006-05-02 Nick Clifton <nickc@redhat.com>
* elf32-sh-symbian.c: Rename local define DEBUG to SYMBIAN_DEBUG
in order to avoid conflicts with the global DEBUG define.
2006-05-02 Alan Modra <amodra@bigpond.net.au> 2006-05-02 Alan Modra <amodra@bigpond.net.au>
* dwarf2.c: Formatting. * dwarf2.c: Formatting.

50
bfd/elf32-sh-symbian.c
View File

@ -26,8 +26,8 @@
#include "elf32-sh.c" #include "elf32-sh.c"
//#define DEBUG 1 //#define SYMBIAN_DEBUG 1
#define DEBUG 0 #define SYMBIAN_DEBUG 0
#define DIRECTIVE_HEADER "#<SYMEDIT>#\n" #define DIRECTIVE_HEADER "#<SYMEDIT>#\n"
#define DIRECTIVE_IMPORT "IMPORT " #define DIRECTIVE_IMPORT "IMPORT "
@ -36,7 +36,7 @@
/* Macro to advance 's' until either it reaches 'e' or the /* Macro to advance 's' until either it reaches 'e' or the
character pointed to by 's' is equal to 'c'. If 'e' is character pointed to by 's' is equal to 'c'. If 'e' is
reached and DEBUG is enabled then the error message 'm' reached and SYMBIAN_DEBUG is enabled then the error message 'm'
is displayed. */ is displayed. */
#define SKIP_UNTIL(s,e,c,m) \ #define SKIP_UNTIL(s,e,c,m) \
do \ do \
@ -45,7 +45,7 @@
++ s; \ ++ s; \
if (s >= e) \ if (s >= e) \
{ \ { \
if (DEBUG) \ if (SYMBIAN_DEBUG) \
fprintf (stderr, "Corrupt directive: %s\n", m); \ fprintf (stderr, "Corrupt directive: %s\n", m); \
result = FALSE; \ result = FALSE; \
} \ } \
@ -63,7 +63,7 @@
++ s; \ ++ s; \
if (s >= e) \ if (s >= e) \
{ \ { \
if (DEBUG) \ if (SYMBIAN_DEBUG) \
fprintf (stderr, "Corrupt directive: %s\n", m); \ fprintf (stderr, "Corrupt directive: %s\n", m); \
result = FALSE; \ result = FALSE; \
} \ } \
@ -74,7 +74,7 @@
/* Macro to advance 's' until either it reaches 'e' or the /* Macro to advance 's' until either it reaches 'e' or the
character pointed to by 's' is not equal to 'c'. If 'e' character pointed to by 's' is not equal to 'c'. If 'e'
is reached and DEBUG is enabled then the error message is reached and SYMBIAN_DEBUG is enabled then the error message
'm' is displayed. */ 'm' is displayed. */
#define SKIP_WHILE(s,e,c,m) \ #define SKIP_WHILE(s,e,c,m) \
do \ do \
@ -83,7 +83,7 @@
++ s; \ ++ s; \
if (s >= e) \ if (s >= e) \
{ \ { \
if (DEBUG) \ if (SYMBIAN_DEBUG) \
fprintf (stderr, "Corrupt directive: %s\n", m); \ fprintf (stderr, "Corrupt directive: %s\n", m); \
result = FALSE; \ result = FALSE; \
} \ } \
@ -114,7 +114,7 @@ sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd,
struct elf_link_hash_entry * new_hash; struct elf_link_hash_entry * new_hash;
symbol_rename * node; symbol_rename * node;
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT '%s' AS '%s'\n", current_name, new_name); fprintf (stderr, "IMPORT '%s' AS '%s'\n", current_name, new_name);
for (node = rename_list; node; node = node->next) for (node = rename_list; node; node = node->next)
@ -132,14 +132,14 @@ sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd,
if ((node = bfd_malloc (sizeof * node)) == NULL) if ((node = bfd_malloc (sizeof * node)) == NULL)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: No mem for new rename node\n"); fprintf (stderr, "IMPORT AS: No mem for new rename node\n");
return FALSE; return FALSE;
} }
if ((node->current_name = bfd_malloc (strlen (current_name) + 1)) == NULL) if ((node->current_name = bfd_malloc (strlen (current_name) + 1)) == NULL)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: No mem for current name field in rename node\n"); fprintf (stderr, "IMPORT AS: No mem for current name field in rename node\n");
free (node); free (node);
return FALSE; return FALSE;
@ -149,7 +149,7 @@ sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd,
if ((node->new_name = bfd_malloc (strlen (new_name) + 1)) == NULL) if ((node->new_name = bfd_malloc (strlen (new_name) + 1)) == NULL)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: No mem for new name field in rename node\n"); fprintf (stderr, "IMPORT AS: No mem for new name field in rename node\n");
free (node->current_name); free (node->current_name);
free (node); free (node);
@ -175,7 +175,7 @@ sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd,
static bfd_boolean static bfd_boolean
sh_symbian_import (bfd * abfd ATTRIBUTE_UNUSED, char * name) sh_symbian_import (bfd * abfd ATTRIBUTE_UNUSED, char * name)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT '%s'\n", name); fprintf (stderr, "IMPORT '%s'\n", name);
/* XXX: Generate an import somehow ? */ /* XXX: Generate an import somehow ? */
@ -186,7 +186,7 @@ sh_symbian_import (bfd * abfd ATTRIBUTE_UNUSED, char * name)
static bfd_boolean static bfd_boolean
sh_symbian_export (bfd * abfd ATTRIBUTE_UNUSED, char * name) sh_symbian_export (bfd * abfd ATTRIBUTE_UNUSED, char * name)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "EXPORT '%s'\n", name); fprintf (stderr, "EXPORT '%s'\n", name);
/* XXX: Generate an export somehow ? */ /* XXX: Generate an export somehow ? */
@ -266,7 +266,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
if (strncmp (s, DIRECTIVE_AS, strlen (DIRECTIVE_AS))) if (strncmp (s, DIRECTIVE_AS, strlen (DIRECTIVE_AS)))
{ {
/* Skip the new-line at the end of the name. */ /* Skip the new-line at the end of the name. */
if (DEBUG && name_end_char != '\n') if (SYMBIAN_DEBUG && name_end_char != '\n')
fprintf (stderr, "IMPORT: No newline at end of directive\n"); fprintf (stderr, "IMPORT: No newline at end of directive\n");
else else
s ++; s ++;
@ -276,7 +276,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
/* Skip past the NUL character. */ /* Skip past the NUL character. */
if (* s ++ != 0) if (* s ++ != 0)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT: No NUL at end of directive\n"); fprintf (stderr, "IMPORT: No NUL at end of directive\n");
} }
} }
@ -300,7 +300,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
SKIP_WHILE (s, e, ' ', "IMPORT AS: Current name just followed by spaces"); SKIP_WHILE (s, e, ' ', "IMPORT AS: Current name just followed by spaces");
/* Skip past the newline character. */ /* Skip past the newline character. */
if (* s ++ != '\n') if (* s ++ != '\n')
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: No newline at end of directive\n"); fprintf (stderr, "IMPORT AS: No newline at end of directive\n");
/* Terminate the current name after having performed the skips. */ /* Terminate the current name after having performed the skips. */
@ -311,7 +311,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
/* The next character should be a NUL. */ /* The next character should be a NUL. */
if (* s != 0) if (* s != 0)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: Junk at end of directive\n"); fprintf (stderr, "IMPORT AS: Junk at end of directive\n");
result = FALSE; result = FALSE;
} }
@ -355,7 +355,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
/* The next character should be a NUL. */ /* The next character should be a NUL. */
if (* s != 0) if (* s != 0)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "EXPORT: Junk at end of directive\n"); fprintf (stderr, "EXPORT: Junk at end of directive\n");
result = FALSE; result = FALSE;
} }
@ -373,7 +373,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
if (! result) if (! result)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "offset into .directive section: %ld\n", fprintf (stderr, "offset into .directive section: %ld\n",
(long) (directive - (char *) contents)); (long) (directive - (char *) contents));
@ -464,7 +464,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
if (ptr->current_hash == NULL) if (ptr->current_hash == NULL)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "IMPORT AS: current symbol '%s' does not exist\n", ptr->current_name); fprintf (stderr, "IMPORT AS: current symbol '%s' does not exist\n", ptr->current_name);
continue; continue;
} }
@ -511,7 +511,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
if (new_hash->dynindx == -1) if (new_hash->dynindx == -1)
new_hash->def_regular = 1; new_hash->def_regular = 1;
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "Created new symbol %s\n", ptr->new_name); fprintf (stderr, "Created new symbol %s\n", ptr->new_name);
} }
@ -521,7 +521,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
if (* h == new_hash) if (* h == new_hash)
{ {
ptr->new_symndx = h - sym_hashes + num_local_syms; ptr->new_symndx = h - sym_hashes + num_local_syms;
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "Converted new hash to index of %ld\n", ptr->new_symndx); fprintf (stderr, "Converted new hash to index of %ld\n", ptr->new_symndx);
break; break;
} }
@ -539,7 +539,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
new_sym_hashes = bfd_alloc (input_bfd, num_global_syms * sizeof * sym_hashes); new_sym_hashes = bfd_alloc (input_bfd, num_global_syms * sizeof * sym_hashes);
if (new_sym_hashes == NULL) if (new_sym_hashes == NULL)
{ {
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "Out of memory extending hash table\n"); fprintf (stderr, "Out of memory extending hash table\n");
continue; continue;
} }
@ -551,7 +551,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
ptr->new_symndx = num_global_syms - 1 + num_local_syms; ptr->new_symndx = num_global_syms - 1 + num_local_syms;
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "Extended symbol hash table to insert new symbol as index %ld\n", fprintf (stderr, "Extended symbol hash table to insert new symbol as index %ld\n",
ptr->new_symndx); ptr->new_symndx);
} }
@ -601,7 +601,7 @@ sh_symbian_relocate_section (bfd * output_bfd,
if (h == ptr->current_hash) if (h == ptr->current_hash)
{ {
BFD_ASSERT (ptr->new_symndx); BFD_ASSERT (ptr->new_symndx);
if (DEBUG) if (SYMBIAN_DEBUG)
fprintf (stderr, "convert reloc %lx from using index %ld to using index %ld\n", fprintf (stderr, "convert reloc %lx from using index %ld to using index %ld\n",
(long) rel->r_info, (long) ELF32_R_SYM (rel->r_info), ptr->new_symndx); (long) rel->r_info, (long) ELF32_R_SYM (rel->r_info), ptr->new_symndx);
rel->r_info = ELF32_R_INFO (ptr->new_symndx, r_type); rel->r_info = ELF32_R_INFO (ptr->new_symndx, r_type);