mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-09-10 10:12:21 +08:00
Fix formatting of reloc16.c
Regernate generated files.
This commit is contained in:
Nick Clifton
@ -1,3 +1,7 @@
|
||||
2000-07-03 Kazu Hirata <kazu@hxi.com>
|
||||
|
||||
* reloc16.c: Fix formatting.
|
||||
|
||||
2000-07-01 Koundinya K <kk@ddeorg.soft.net>
|
||||
|
||||
* config.bfd: Change targ_defvec and targ_selvecs for mips*-*-sysv4*
|
||||
|
||||
@ -671,7 +671,7 @@ configure.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES)
|
||||
OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS)
|
||||
|
||||
11
bfd/aclocal.m4
vendored
11
bfd/aclocal.m4
vendored
@ -224,7 +224,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
||||
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
||||
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| AC_MSG_ERROR([libtool configure failed])
|
||||
|
||||
# Reload cache, that may have been modified by ltconfig
|
||||
@ -256,11 +256,6 @@ AC_REQUIRE([AC_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
dnl
|
||||
|
||||
case "$target" in
|
||||
NONE) lt_target="$host" ;;
|
||||
*) lt_target="$target" ;;
|
||||
esac
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
libtool_flags="--cache-file=$cache_file"
|
||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||
@ -279,7 +274,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
|
||||
|
||||
# Some flags need to be propagated to the compiler or linker for good
|
||||
# libtool support.
|
||||
case "$lt_target" in
|
||||
case "$host" in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
||||
@ -546,7 +541,7 @@ AC_MSG_RESULT([$NM])
|
||||
AC_DEFUN(AC_CHECK_LIBM,
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case "$lt_target" in
|
||||
case "$host" in
|
||||
*-*-beos* | *-*-cygwin*)
|
||||
# These system don't have libm
|
||||
;;
|
||||
|
||||
393
bfd/configure
vendored
393
bfd/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -188,7 +188,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2000-06-26 18:29-0700\n"
|
||||
"POT-Creation-Date: 2000-07-03 10:46-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -360,7 +360,7 @@ msgstr ""
|
||||
msgid "uncertain calling convention for non-COFF symbol"
|
||||
msgstr ""
|
||||
|
||||
#: cofflink.c:518 elflink.h:1623
|
||||
#: cofflink.c:518 elflink.h:1567
|
||||
#, c-format
|
||||
msgid "Warning: type of symbol `%s' changed from %d to %d in %s"
|
||||
msgstr ""
|
||||
@ -1244,37 +1244,37 @@ msgstr ""
|
||||
msgid "%s: Section %s is already to large to put hole of %ld bytes in"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:1443
|
||||
#: elflink.h:1387
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid version %u (max %d)"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:1484
|
||||
#: elflink.h:1428
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid needed version %d"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:1601
|
||||
#: elflink.h:1545
|
||||
#, c-format
|
||||
msgid "Warning: size of symbol `%s' changed from %lu to %lu in %s"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:1845
|
||||
#: elflink.h:1789
|
||||
#, c-format
|
||||
msgid "%s: warning: unexpected redefinition of `%s'"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:3552
|
||||
#: elflink.h:3496
|
||||
#, c-format
|
||||
msgid "warning: type and size of dynamic symbol `%s' are not defined"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:3824
|
||||
#: elflink.h:3768
|
||||
#, c-format
|
||||
msgid "%s: undefined versioned symbol name %s"
|
||||
msgstr ""
|
||||
|
||||
#: elflink.h:5068
|
||||
#: elflink.h:5012
|
||||
#, c-format
|
||||
msgid "%s: could not find output section %s for input section %s"
|
||||
msgstr ""
|
||||
@ -1409,39 +1409,39 @@ msgid "Unhandled OSF/1 core file section type %d\n"
|
||||
msgstr ""
|
||||
|
||||
#. XXX code yet to be written.
|
||||
#: peicode.h:804
|
||||
#: peicode.h:809
|
||||
#, c-format
|
||||
msgid "%s: Unhandled import type; %x"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:809
|
||||
#: peicode.h:814
|
||||
#, c-format
|
||||
msgid "%s: Unrecognised import type; %x"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:823
|
||||
#: peicode.h:828
|
||||
#, c-format
|
||||
msgid "%s: Unrecognised import name type; %x"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:1180
|
||||
#: peicode.h:1185
|
||||
#, c-format
|
||||
msgid "%s: Unrecognised machine type (0x%x) in Import Library Format archive"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:1192
|
||||
#: peicode.h:1197
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s: Recognised but unhandled machine type (0x%x) in Import Library Format "
|
||||
"archive"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:1209
|
||||
#: peicode.h:1214
|
||||
#, c-format
|
||||
msgid "%s: size field is zero in Import Library Format header"
|
||||
msgstr ""
|
||||
|
||||
#: peicode.h:1237
|
||||
#: peicode.h:1242
|
||||
#, c-format
|
||||
msgid "%s: string not null terminated in ILF object file."
|
||||
msgstr ""
|
||||
|
||||
121
bfd/reloc16.c
121
bfd/reloc16.c
@ -1,5 +1,5 @@
|
||||
/* 8 and 16 bit COFF relocation functions, for BFD.
|
||||
Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
|
||||
Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 2000
|
||||
Free Software Foundation, Inc.
|
||||
Written by Cygnus Support.
|
||||
|
||||
@ -19,10 +19,7 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
|
||||
/*
|
||||
Most of this hacked by Steve Chamberlain,
|
||||
sac@cygnus.com
|
||||
*/
|
||||
/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>. */
|
||||
|
||||
/* These routines are used by coff-h8300 and coff-z8k to do
|
||||
relocation.
|
||||
@ -53,7 +50,7 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
|
||||
asymbol *symbol = *(reloc->sym_ptr_ptr);
|
||||
/* A symbol holds a pointer to a section, and an offset from the
|
||||
base of the section. To relocate, we find where the section will
|
||||
live in the output and add that in */
|
||||
live in the output and add that in. */
|
||||
|
||||
if (bfd_is_und_section (symbol->section)
|
||||
|| bfd_is_com_section (symbol->section))
|
||||
@ -79,29 +76,29 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
|
||||
value = h->u.c.size;
|
||||
else
|
||||
{
|
||||
if (! ((*link_info->callbacks->undefined_symbol)
|
||||
(link_info, bfd_asymbol_name (symbol),
|
||||
input_section->owner, input_section, reloc->address,
|
||||
true)))
|
||||
if (!((*link_info->callbacks->undefined_symbol)
|
||||
(link_info, bfd_asymbol_name (symbol),
|
||||
input_section->owner, input_section, reloc->address,
|
||||
true)))
|
||||
abort ();
|
||||
value = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
value = symbol->value +
|
||||
symbol->section->output_offset +
|
||||
symbol->section->output_section->vma;
|
||||
value = symbol->value
|
||||
+ symbol->section->output_offset
|
||||
+ symbol->section->output_section->vma;
|
||||
}
|
||||
|
||||
/* Add the value contained in the relocation */
|
||||
|
||||
/* Add the value contained in the relocation. */
|
||||
value += reloc->addend;
|
||||
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
void
|
||||
bfd_perform_slip(abfd, slip, input_section, value)
|
||||
bfd_perform_slip (abfd, slip, input_section, value)
|
||||
bfd *abfd;
|
||||
unsigned int slip;
|
||||
asection *input_section;
|
||||
@ -113,13 +110,13 @@ bfd_perform_slip(abfd, slip, input_section, value)
|
||||
BFD_ASSERT (s != (asymbol **) NULL);
|
||||
|
||||
/* Find all symbols past this point, and make them know
|
||||
what's happened */
|
||||
while (*s)
|
||||
what's happened. */
|
||||
while (*s)
|
||||
{
|
||||
asymbol *p = *s;
|
||||
if (p->section == input_section)
|
||||
if (p->section == input_section)
|
||||
{
|
||||
/* This was pointing into this section, so mangle it */
|
||||
/* This was pointing into this section, so mangle it. */
|
||||
if (p->value > value)
|
||||
{
|
||||
p->value -= slip;
|
||||
@ -136,17 +133,17 @@ bfd_perform_slip(abfd, slip, input_section, value)
|
||||
}
|
||||
}
|
||||
s++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
boolean
|
||||
boolean
|
||||
bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
|
||||
bfd *abfd;
|
||||
asection *i;
|
||||
struct bfd_link_info *link_info;
|
||||
boolean *again;
|
||||
{
|
||||
/* Get enough memory to hold the stuff */
|
||||
/* Get enough memory to hold the stuff. */
|
||||
bfd *input_bfd = i->owner;
|
||||
asection *input_section = i;
|
||||
int *shrinks;
|
||||
@ -166,7 +163,7 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
|
||||
if (!reloc_vector && reloc_size > 0)
|
||||
return false;
|
||||
|
||||
/* Get the relocs and think about them */
|
||||
/* Get the relocs and think about them. */
|
||||
reloc_count =
|
||||
bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector,
|
||||
_bfd_generic_link_get_symbols (input_bfd));
|
||||
@ -190,7 +187,7 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
|
||||
entire link, we could use the generic relaxing code in the linker
|
||||
and get better results, particularly for jsr->bsr and 24->16 bit
|
||||
memory reference relaxations. */
|
||||
|
||||
|
||||
if (reloc_count > 0)
|
||||
{
|
||||
int another_pass = 0;
|
||||
@ -208,7 +205,7 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
|
||||
|
||||
another_pass = 0;
|
||||
|
||||
for (i = 0, parent = reloc_vector; *parent; parent++, i++)
|
||||
for (i = 0, parent = reloc_vector; *parent; parent++, i++)
|
||||
{
|
||||
/* Let the target/machine dependent code examine each reloc
|
||||
in this section and attempt to shrink it. */
|
||||
@ -224,15 +221,15 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
|
||||
shrinks[j] += shrink - shrinks[i];
|
||||
}
|
||||
}
|
||||
|
||||
} while (another_pass);
|
||||
}
|
||||
while (another_pass);
|
||||
|
||||
shrink = shrinks[reloc_count];
|
||||
free((char *)shrinks);
|
||||
free ((char *) shrinks);
|
||||
}
|
||||
|
||||
input_section->_cooked_size -= shrink;
|
||||
free((char *)reloc_vector);
|
||||
input_section->_cooked_size -= shrink;
|
||||
free ((char *) reloc_vector);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -250,7 +247,7 @@ bfd_coff_reloc16_get_relocated_section_contents(in_abfd,
|
||||
boolean relocateable;
|
||||
asymbol **symbols;
|
||||
{
|
||||
/* Get enough memory to hold the stuff */
|
||||
/* Get enough memory to hold the stuff. */
|
||||
bfd *input_bfd = link_order->u.indirect.section->owner;
|
||||
asection *input_section = link_order->u.indirect.section;
|
||||
long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
|
||||
@ -267,20 +264,19 @@ bfd_coff_reloc16_get_relocated_section_contents(in_abfd,
|
||||
data, relocateable,
|
||||
symbols);
|
||||
|
||||
/* read in the section */
|
||||
if (! bfd_get_section_contents(input_bfd,
|
||||
input_section,
|
||||
data,
|
||||
0,
|
||||
input_section->_raw_size))
|
||||
/* Read in the section. */
|
||||
if (!bfd_get_section_contents(input_bfd,
|
||||
input_section,
|
||||
data,
|
||||
0,
|
||||
input_section->_raw_size))
|
||||
return NULL;
|
||||
|
||||
|
||||
reloc_vector = (arelent **) bfd_malloc((size_t) reloc_size);
|
||||
|
||||
reloc_vector = (arelent **) bfd_malloc ((size_t) reloc_size);
|
||||
if (!reloc_vector && reloc_size != 0)
|
||||
return NULL;
|
||||
|
||||
reloc_count = bfd_canonicalize_reloc (input_bfd,
|
||||
|
||||
reloc_count = bfd_canonicalize_reloc (input_bfd,
|
||||
input_section,
|
||||
reloc_vector,
|
||||
symbols);
|
||||
@ -289,49 +285,46 @@ bfd_coff_reloc16_get_relocated_section_contents(in_abfd,
|
||||
free (reloc_vector);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
if (reloc_count > 0)
|
||||
{
|
||||
arelent **parent = reloc_vector;
|
||||
arelent *reloc ;
|
||||
arelent *reloc;
|
||||
unsigned int dst_address = 0;
|
||||
unsigned int src_address = 0;
|
||||
unsigned int run;
|
||||
unsigned int idx;
|
||||
|
||||
/* Find how long a run we can do */
|
||||
while (dst_address < link_order->size)
|
||||
|
||||
/* Find how long a run we can do. */
|
||||
while (dst_address < link_order->size)
|
||||
{
|
||||
reloc = *parent;
|
||||
if (reloc)
|
||||
if (reloc)
|
||||
{
|
||||
/* Note that the relaxing didn't tie up the addresses in the
|
||||
relocation, so we use the original address to work out the
|
||||
run of non-relocated data */
|
||||
run of non-relocated data. */
|
||||
run = reloc->address - src_address;
|
||||
parent++;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
run = link_order->size - dst_address;
|
||||
}
|
||||
/* Copy the bytes */
|
||||
|
||||
/* Copy the bytes. */
|
||||
for (idx = 0; idx < run; idx++)
|
||||
{
|
||||
data[dst_address++] = data[src_address++];
|
||||
}
|
||||
|
||||
/* Now do the relocation */
|
||||
|
||||
if (reloc)
|
||||
data[dst_address++] = data[src_address++];
|
||||
|
||||
/* Now do the relocation. */
|
||||
if (reloc)
|
||||
{
|
||||
bfd_coff_reloc16_extra_cases (input_bfd, link_info, link_order,
|
||||
reloc, data, &src_address,
|
||||
&dst_address);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
free((char *)reloc_vector);
|
||||
free ((char *) reloc_vector);
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user