espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 14:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/obj-coff.c (c_symbol_merge): Fix copying of auxiliary

Browse Source 
information.
This commit is contained in:
Ian Lance Taylor
1998-06-22 23:53:10 +00:00
parent 59bbaa1950
commit aa3c8d2d37
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jun 22 19:52:42 1998 Ian Lance Taylor <ian@cygnus.com>
* config/obj-coff.c (c_symbol_merge): Fix copying of auxiliary
information.
start-sanitize-am33 start-sanitize-am33
Mon Jun 22 13:45:19 1998 Jeffrey A Law (law@cygnus.com) Mon Jun 22 13:45:19 1998 Jeffrey A Law (law@cygnus.com)

35
gas/config/obj-coff.c
View File

@ -270,21 +270,17 @@ c_symbol_merge (debug, normal)
S_SET_STORAGE_CLASS (normal, S_GET_STORAGE_CLASS (debug)); S_SET_STORAGE_CLASS (normal, S_GET_STORAGE_CLASS (debug));
if (S_GET_NUMBER_AUXILIARY (debug) > S_GET_NUMBER_AUXILIARY (normal)) if (S_GET_NUMBER_AUXILIARY (debug) > S_GET_NUMBER_AUXILIARY (normal))
/* take the most we have */ {
S_SET_NUMBER_AUXILIARY (normal, S_GET_NUMBER_AUXILIARY (debug)); /* take the most we have */
S_SET_NUMBER_AUXILIARY (normal, S_GET_NUMBER_AUXILIARY (debug));
}
if (S_GET_NUMBER_AUXILIARY (debug) > 0) if (S_GET_NUMBER_AUXILIARY (debug) > 0)
{ {
/* Move all the auxiliary information. */ /* Move all the auxiliary information. */
/* @@ How many fields do we want to preserve? Would it make more memcpy (coffsymbol (normal->bsym)->native + 1,
sense to pick and choose those we want to copy? Should look coffsymbol (debug->bsym)->native + 1,
into this further.... [raeburn:19920512.2209EST] */ S_GET_NUMBER_AUXILIARY (debug) * sizeof (combined_entry_type));
alent *linenos;
linenos = coffsymbol (normal->bsym)->lineno;
memcpy ((char *) &coffsymbol (normal->bsym)->native,
(char *) &coffsymbol (debug->bsym)->native,
S_GET_NUMBER_AUXILIARY(debug) * AUXESZ);
coffsymbol (normal->bsym)->lineno = linenos;
} }
/* Move the debug flags. */ /* Move the debug flags. */
@ -344,21 +340,20 @@ void
coff_obj_symbol_new_hook (symbolP) coff_obj_symbol_new_hook (symbolP)
symbolS *symbolP; symbolS *symbolP;
{ {
char underscore = 0; /* Symbol has leading _ */ long sz = (OBJ_COFF_MAX_AUXENTRIES + 1) * sizeof (combined_entry_type);
char * s = (char *) xmalloc (sz);
memset (s, 0, sz);
coffsymbol (symbolP->bsym)->native = (combined_entry_type *) s;
{
long sz = (OBJ_COFF_MAX_AUXENTRIES + 1) * sizeof (combined_entry_type);
char *s = (char *) xmalloc (sz);
memset (s, 0, sz);
coffsymbol (symbolP->bsym)->native = (combined_entry_type *) s;
}
S_SET_DATA_TYPE (symbolP, T_NULL); S_SET_DATA_TYPE (symbolP, T_NULL);
S_SET_STORAGE_CLASS (symbolP, 0); S_SET_STORAGE_CLASS (symbolP, 0);
S_SET_NUMBER_AUXILIARY (symbolP, 0); S_SET_NUMBER_AUXILIARY (symbolP, 0);
if (S_IS_STRING (symbolP)) if (S_IS_STRING (symbolP))
SF_SET_STRING (symbolP); SF_SET_STRING (symbolP);
if (!underscore && S_IS_LOCAL (symbolP))
if (S_IS_LOCAL (symbolP))
SF_SET_LOCAL (symbolP); SF_SET_LOCAL (symbolP);
} }
@ -514,6 +509,7 @@ obj_coff_endef (ignore)
int ignore; int ignore;
{ {
symbolS *symbolP; symbolS *symbolP;
/* DIM BUG FIX sac@cygnus.com */ /* DIM BUG FIX sac@cygnus.com */
dim_index = 0; dim_index = 0;
if (def_symbol_in_progress == NULL) if (def_symbol_in_progress == NULL)
@ -586,6 +582,7 @@ obj_coff_endef (ignore)
/* Valid but set somewhere else (s_comm, s_lcomm, colon) */ /* Valid but set somewhere else (s_comm, s_lcomm, colon) */
break; break;
default:
case C_USTATIC: case C_USTATIC:
case C_EXTDEF: case C_EXTDEF:
case C_ULABEL: case C_ULABEL: