2000-11-08 Kazu Hirata <kazu@hxi.com>

* bfd.c: Fix formatting.
	* binary.c: Likewise.
	* bout.c: Likewise.
This commit is contained in:
Kazu Hirata
2000-11-08 06:38:10 +00:00
parent ed37ab2087
commit aebad5fe2c
4 changed files with 32 additions and 47 deletions

View File

@ -1,3 +1,9 @@
2000-11-08 Kazu Hirata <kazu@hxi.com>
* bfd.c: Fix formatting.
* binary.c: Likewise.
* bout.c: Likewise.
2000-11-07 Kazu Hirata <kazu@hxi.com> 2000-11-07 Kazu Hirata <kazu@hxi.com>
* aix386-core.c: Fix formatting. * aix386-core.c: Fix formatting.

View File

@ -219,7 +219,6 @@ CODE_FRAGMENT
it to the following struct so that the data will be available in coffcode.h it to the following struct so that the data will be available in coffcode.h
where it is needed. The typedef's used are defined in bfd.h */ where it is needed. The typedef's used are defined in bfd.h */
/* /*
SECTION SECTION
@ -376,7 +375,7 @@ bfd_perror (message)
CONST char *message; CONST char *message;
{ {
if (bfd_get_error () == bfd_error_system_call) if (bfd_get_error () == bfd_error_system_call)
perror((char *)message); /* must be system error then... */ perror((char *)message); /* must be system error then... */
else { else {
if (message == NULL || *message == '\0') if (message == NULL || *message == '\0')
fprintf (stderr, "%s\n", bfd_errmsg (bfd_get_error ())); fprintf (stderr, "%s\n", bfd_errmsg (bfd_get_error ()));
@ -510,7 +509,6 @@ bfd_set_error_program_name (name)
_bfd_error_program_name = name; _bfd_error_program_name = name;
} }
/* /*
FUNCTION FUNCTION
bfd_get_error_handler bfd_get_error_handler
@ -547,7 +545,6 @@ DESCRIPTION
*/ */
long long
bfd_get_reloc_upper_bound (abfd, asect) bfd_get_reloc_upper_bound (abfd, asect)
bfd *abfd; bfd *abfd;
@ -584,7 +581,6 @@ DESCRIPTION
The @var{syms} table is also needed for horrible internal magic The @var{syms} table is also needed for horrible internal magic
reasons. reasons.
*/ */
long long
bfd_canonicalize_reloc (abfd, asect, location, symbols) bfd_canonicalize_reloc (abfd, asect, location, symbols)
@ -615,7 +611,7 @@ DESCRIPTION
The argument @var{abfd} is ignored. The argument @var{abfd} is ignored.
*/ */
/*ARGSUSED*/
void void
bfd_set_reloc (ignore_abfd, asect, location, count) bfd_set_reloc (ignore_abfd, asect, location, count)
bfd *ignore_abfd ATTRIBUTE_UNUSED; bfd *ignore_abfd ATTRIBUTE_UNUSED;
@ -786,7 +782,6 @@ bfd_vma vma;
return true; return true;
} }
/* /*
FUNCTION FUNCTION
bfd_get_mtime bfd_get_mtime

View File

@ -291,7 +291,7 @@ binary_set_section_contents (abfd, sec, data, offset, size)
LMA's all over the place, huge (sparse?) binary files may LMA's all over the place, huge (sparse?) binary files may
result. This condition attempts to detect this situation result. This condition attempts to detect this situation
and print a warning. Better heuristics would be nice to and print a warning. Better heuristics would be nice to
have. */ have. */
if (s->filepos < 0) if (s->filepos < 0)
(*_bfd_error_handler) (*_bfd_error_handler)

View File

@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h" #include "bfd.h"
#include "sysdep.h" #include "sysdep.h"
#include "libbfd.h" #include "libbfd.h"
@ -30,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "aout/stab_gnu.h" #include "aout/stab_gnu.h"
#include "libaout.h" /* BFD a.out internal data structures */ #include "libaout.h" /* BFD a.out internal data structures */
static int aligncode PARAMS ((bfd *abfd, asection *input_section, static int aligncode PARAMS ((bfd *abfd, asection *input_section,
arelent *r, unsigned int shrink)); arelent *r, unsigned int shrink));
static void perform_slip PARAMS ((bfd *abfd, unsigned int slip, static void perform_slip PARAMS ((bfd *abfd, unsigned int slip,
@ -97,7 +95,7 @@ bout_swap_exec_header_out (abfd, execp, raw_bytes)
{ {
struct external_exec *bytes = (struct external_exec *)raw_bytes; struct external_exec *bytes = (struct external_exec *)raw_bytes;
/* Now fill in fields in the raw data, from the fields in the exec struct. */ /* Now fill in fields in the raw data, from the fields in the exec struct. */
bfd_h_put_32 (abfd, execp->a_info , bytes->e_info); bfd_h_put_32 (abfd, execp->a_info , bytes->e_info);
PUT_WORD (abfd, execp->a_text , bytes->e_text); PUT_WORD (abfd, execp->a_text , bytes->e_text);
PUT_WORD (abfd, execp->a_data , bytes->e_data); PUT_WORD (abfd, execp->a_data , bytes->e_data);
@ -114,7 +112,6 @@ bout_swap_exec_header_out (abfd, execp, raw_bytes)
bytes->e_relaxable[0] = execp->a_relaxable; bytes->e_relaxable[0] = execp->a_relaxable;
} }
static const bfd_target * static const bfd_target *
b_out_object_p (abfd) b_out_object_p (abfd)
bfd *abfd; bfd *abfd;
@ -140,7 +137,6 @@ b_out_object_p (abfd)
return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback); return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback);
} }
/* Finish up the opening of a b.out file for reading. Fill in all the /* Finish up the opening of a b.out file for reading. Fill in all the
fields that are not handled by common code. */ fields that are not handled by common code. */
@ -189,8 +185,8 @@ b_out_callback (abfd)
obj_textsec (abfd)->rel_filepos = N_TROFF(*execp); obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
obj_datasec (abfd)->rel_filepos = N_DROFF(*execp); obj_datasec (abfd)->rel_filepos = N_DROFF(*execp);
adata(abfd).page_size = 1; /* Not applicable. */ adata(abfd).page_size = 1; /* Not applicable. */
adata(abfd).segment_size = 1; /* Not applicable. */ adata(abfd).segment_size = 1; /* Not applicable. */
adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
if (execp->a_relaxable) if (execp->a_relaxable)
@ -344,7 +340,6 @@ b_out_write_object_contents (abfd)
#define CALL 0x09000000 #define CALL 0x09000000
#define PCREL13_MASK 0x1fff #define PCREL13_MASK 0x1fff
#define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma) #define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma)
/* Magic to turn callx into calljx */ /* Magic to turn callx into calljx */
@ -384,7 +379,6 @@ calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section)
return bfd_reloc_ok; return bfd_reloc_ok;
} }
/* Magic to turn call into callj */ /* Magic to turn call into callj */
static bfd_reloc_status_type static bfd_reloc_status_type
callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx, callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx,
@ -472,7 +466,6 @@ HOWTO(PCREL24, 0, 2, 24, true, 0, complain_overflow_signed,0,"pcrel24", true, 0x
static reloc_howto_type howto_reloc_pcrel13 = static reloc_howto_type howto_reloc_pcrel13 =
HOWTO(PCREL13, 0, 2, 13, true, 0, complain_overflow_signed,0,"pcrel13", true, 0x00001fff,0x00001fff,false); HOWTO(PCREL13, 0, 2, 13, true, 0, complain_overflow_signed,0,"pcrel13", true, 0x00001fff,0x00001fff,false);
static reloc_howto_type howto_reloc_abs32codeshrunk = static reloc_howto_type howto_reloc_abs32codeshrunk =
HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callx->callj", true, 0x00ffffff, 0x00ffffff,false); HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callx->callj", true, 0x00ffffff, 0x00ffffff,false);
@ -577,8 +570,6 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
return false; return false;
} }
if (bfd_header_big_endian (abfd)) { if (bfd_header_big_endian (abfd)) {
/* big-endian bit field allocation order */ /* big-endian bit field allocation order */
pcrel_mask = 0x80; pcrel_mask = 0x80;
@ -728,17 +719,14 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
} }
} }
if (relocs != NULL) if (relocs != NULL)
free (relocs); free (relocs);
asect->relocation = reloc_cache; asect->relocation = reloc_cache;
asect->reloc_count = count; asect->reloc_count = count;
return true; return true;
} }
static boolean static boolean
b_out_squirt_out_relocs (abfd, section) b_out_squirt_out_relocs (abfd, section)
bfd *abfd; bfd *abfd;
@ -1008,8 +996,6 @@ b_out_sizeof_headers (ignore_abfd, ignore)
return sizeof(struct internal_exec); return sizeof(struct internal_exec);
} }
/************************************************************************/ /************************************************************************/
static bfd_vma static bfd_vma
get_value (reloc, link_info, input_section) get_value (reloc, link_info, input_section)
@ -1125,7 +1111,6 @@ abs32code (abfd, input_section, r, shrink, link_info)
gap = value - (dot - shrink); gap = value - (dot - shrink);
if (-1<<23 < (long)gap && (long)gap < 1<<23 ) if (-1<<23 < (long)gap && (long)gap < 1<<23 )
{ {
/* Change the reloc type from 32bitcode possible 24, to 24bit /* Change the reloc type from 32bitcode possible 24, to 24bit
@ -1498,7 +1483,6 @@ const bfd_target b_out_vec_big_host =
(PTR) 0, (PTR) 0,
}; };
const bfd_target b_out_vec_little_host = const bfd_target b_out_vec_little_host =
{ {
"b.out.little", /* name */ "b.out.little", /* name */