b7761f1106
bfd/ 2012-01-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/13616 * archures.c (bfd_arch_info): Add fill. (bfd_default_arch_struct): Add bfd_arch_default_fill. (bfd_arch_default_fill): New. * configure.in: Set bfd version to 2.22.52. * configure: Regenerated. * cpu-alpha.c: Add bfd_arch_default_fill to bfd_arch_info initializer. * cpu-arc.c: Likewise. * cpu-arm.c: Likewise. * cpu-avr.c: Likewise. * cpu-bfin.c: Likewise. * cpu-cr16.c: Likewise. * cpu-cr16c.c: Likewise. * cpu-cris.c: Likewise. * cpu-crx.c: Likewise. * cpu-d10v.c: Likewise. * cpu-d30v.c: Likewise. * cpu-dlx.c: Likewise. * cpu-epiphany.c: Likewise. * cpu-fr30.c: Likewise. * cpu-frv.c: Likewise. * cpu-h8300.c: Likewise. * cpu-h8500.c: Likewise. * cpu-hppa.c: Likewise. * cpu-i370.c: Likewise. * cpu-i860.c: Likewise. * cpu-i960.c: Likewise. * cpu-ia64.c: Likewise. * cpu-ip2k.c: Likewise. * cpu-iq2000.c: Likewise. * cpu-lm32.c: Likewise. * cpu-m10200.c: Likewise. * cpu-m10300.c: Likewise. * cpu-m32c.c: Likewise. * cpu-m32r.c: Likewise. * cpu-m68hc11.c: Likewise. * cpu-m68hc12.c: Likewise. * cpu-m68k.c: Likewise. * cpu-m88k.c: Likewise. * cpu-mcore.c: Likewise. * cpu-mep.c: Likewise. * cpu-microblaze.c: Likewise. * cpu-mips.c: Likewise. * cpu-mmix.c: Likewise. * cpu-moxie.c: Likewise. * cpu-msp430.c: Likewise. * cpu-mt.c: Likewise. * cpu-ns32k.c: Likewise. * cpu-openrisc.c: Likewise. * cpu-or32.c: Likewise. * cpu-pdp11.c: Likewise. * cpu-pj.c: Likewise. * cpu-plugin.c: Likewise. * cpu-powerpc.c: Likewise. * cpu-rl78.c: Likewise. * cpu-rs6000.c: Likewise. * cpu-rx.c: Likewise. * cpu-s390.c: Likewise. * cpu-score.c: Likewise. * cpu-sh.c: Likewise. * cpu-sparc.c: Likewise. * cpu-spu.c: Likewise. * cpu-tic30.c: Likewise. * cpu-tic4x.c: Likewise. * cpu-tic54x.c: Likewise. * cpu-tic6x.c: Likewise. * cpu-tic80.c: Likewise. * cpu-tilegx.c: Likewise. * cpu-tilepro.c: Likewise. * cpu-v850.c: Likewise. * cpu-vax.c: Likewise. * cpu-w65.c: Likewise. * cpu-we32k.c: Likewise. * cpu-xc16x.c: Likewise. * cpu-xstormy16.c: Likewise. * cpu-xtensa.c: Likewise. * cpu-z80.c: Likewise. * cpu-z8k.c: Likewise. * cpu-i386.c: Include "libiberty.h". (bfd_arch_i386_fill): New. Add bfd_arch_i386_fill to bfd_arch_info initializer. * cpu-k1om.c: Add bfd_arch_i386_fill to bfd_arch_info initializer. * cpu-l1om.c: Likewise. * linker.c (default_data_link_order): Call abfd->arch_info->fill if fill size is 0. * bfd-in2.h: Regenerated. include/ 2012-01-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/13616 * bfdlink.h (bfd_link_order): Update comments on data size. ld/ 2012-01-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/13616 * emulparams/elf32_x86_64.sh: Remove NOP. * emulparams/elf_i386.sh: Likewise. * emulparams/elf_i386_be.sh: Likewise. * emulparams/elf_i386_ldso.sh: Likewise. * emulparams/elf_i386_vxworks.sh: Likewise. * emulparams/elf_k1om.sh: Likewise. * emulparams/elf_l1om.sh: Likewise. * emulparams/elf_x86_64.sh: Likewise. * ldlang.c (zero_fill): Initialized to 0. * ldwrite.c (build_link_order): Set data size to linker odrder size when they are the same. * scripttempl/elf.sc: Don't specify fill if NOP is undefined. ld/testsuite/ 2012-01-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/13616 * ld-i386/tlsbindesc.dd: Update no-op padding. * ld-i386/tlsnopic.dd: Likewise. * ld-i386/tlspic.dd: Likewise. * ld-x86-64/tlsbin.dd: Likewise. * ld-x86-64/tlsbindesc.dd: Likewise. * ld-x86-64/tlspic.dd: Likewise.
270 lines
6.7 KiB
C
270 lines
6.7 KiB
C
/* BFD library support routines for the Renesas H8/300 architecture.
|
|
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002,
|
|
2003, 2004, 2005, 2007 Free Software Foundation, Inc.
|
|
Hacked by Steve Chamberlain of Cygnus Support.
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#include "sysdep.h"
|
|
#include "bfd.h"
|
|
#include "libbfd.h"
|
|
|
|
static bfd_boolean
|
|
h8300_scan (const struct bfd_arch_info *info, const char *string)
|
|
{
|
|
if (*string != 'h' && *string != 'H')
|
|
return FALSE;
|
|
|
|
string++;
|
|
if (*string != '8')
|
|
return FALSE;
|
|
|
|
string++;
|
|
if (*string == '/')
|
|
string++;
|
|
|
|
if (*string != '3')
|
|
return FALSE;
|
|
string++;
|
|
if (*string != '0')
|
|
return FALSE;
|
|
string++;
|
|
if (*string != '0')
|
|
return FALSE;
|
|
string++;
|
|
if (*string == '-')
|
|
string++;
|
|
|
|
/* In ELF linker scripts, we typically express the architecture/machine
|
|
as architecture:machine.
|
|
|
|
So if we've matched so far and encounter a colon, try to match the
|
|
string following the colon. */
|
|
if (*string == ':')
|
|
{
|
|
string++;
|
|
return h8300_scan (info, string);
|
|
}
|
|
|
|
if (*string == 'h' || *string == 'H')
|
|
{
|
|
string++;
|
|
if (*string == 'n' || *string == 'N')
|
|
return (info->mach == bfd_mach_h8300hn);
|
|
|
|
return (info->mach == bfd_mach_h8300h);
|
|
}
|
|
else if (*string == 's' || *string == 'S')
|
|
{
|
|
string++;
|
|
if (*string == 'n' || *string == 'N')
|
|
return (info->mach == bfd_mach_h8300sn);
|
|
|
|
if (*string == 'x' || *string == 'X')
|
|
{
|
|
string++;
|
|
if (*string == 'n' || *string == 'N')
|
|
return (info->mach == bfd_mach_h8300sxn);
|
|
|
|
return (info->mach == bfd_mach_h8300sx);
|
|
}
|
|
|
|
return (info->mach == bfd_mach_h8300s);
|
|
}
|
|
else
|
|
return info->mach == bfd_mach_h8300;
|
|
}
|
|
|
|
/* This routine is provided two arch_infos and works out the machine
|
|
which would be compatible with both and returns a pointer to its
|
|
info structure. */
|
|
|
|
static const bfd_arch_info_type *
|
|
compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
|
|
{
|
|
if (in->arch != out->arch)
|
|
return 0;
|
|
if (in->mach == bfd_mach_h8300sx && out->mach == bfd_mach_h8300s)
|
|
return in;
|
|
if (in->mach == bfd_mach_h8300s && out->mach == bfd_mach_h8300sx)
|
|
return out;
|
|
if (in->mach == bfd_mach_h8300sxn && out->mach == bfd_mach_h8300sn)
|
|
return in;
|
|
if (in->mach == bfd_mach_h8300sn && out->mach == bfd_mach_h8300sxn)
|
|
return out;
|
|
/* It's really not a good idea to mix and match modes. */
|
|
if (in->mach != out->mach)
|
|
return 0;
|
|
else
|
|
return in;
|
|
}
|
|
|
|
static const bfd_arch_info_type h8300sxn_info_struct =
|
|
{
|
|
32, /* 32 bits in a word */
|
|
16, /* 16 bits in an address */
|
|
8, /* 8 bits in a byte */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300sxn,
|
|
"h8300sxn", /* arch_name */
|
|
"h8300sxn", /* printable name */
|
|
1,
|
|
FALSE, /* the default machine */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
0
|
|
};
|
|
|
|
static const bfd_arch_info_type h8300sx_info_struct =
|
|
{
|
|
32, /* 32 bits in a word */
|
|
32, /* 32 bits in an address */
|
|
8, /* 8 bits in a byte */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300sx,
|
|
"h8300sx", /* arch_name */
|
|
"h8300sx", /* printable name */
|
|
1,
|
|
FALSE, /* the default machine */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
&h8300sxn_info_struct
|
|
};
|
|
|
|
static const bfd_arch_info_type h8300sn_info_struct =
|
|
{
|
|
32, /* 32 bits in a word. */
|
|
16, /* 16 bits in an address. */
|
|
8, /* 8 bits in a byte. */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300sn,
|
|
"h8300sn", /* Architecture name. */
|
|
"h8300sn", /* Printable name. */
|
|
1,
|
|
FALSE, /* The default machine. */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
&h8300sx_info_struct
|
|
};
|
|
|
|
static const bfd_arch_info_type h8300hn_info_struct =
|
|
{
|
|
32, /* 32 bits in a word. */
|
|
16, /* 16 bits in an address. */
|
|
8, /* 8 bits in a byte. */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300hn,
|
|
"h8300hn", /* Architecture name. */
|
|
"h8300hn", /* Printable name. */
|
|
1,
|
|
FALSE, /* The default machine. */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
&h8300sn_info_struct
|
|
};
|
|
|
|
static const bfd_arch_info_type h8300s_info_struct =
|
|
{
|
|
32, /* 32 bits in a word. */
|
|
32, /* 32 bits in an address. */
|
|
8, /* 8 bits in a byte. */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300s,
|
|
"h8300s", /* Architecture name. */
|
|
"h8300s", /* Printable name. */
|
|
1,
|
|
FALSE, /* The default machine. */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
& h8300hn_info_struct
|
|
};
|
|
|
|
static const bfd_arch_info_type h8300h_info_struct =
|
|
{
|
|
32, /* 32 bits in a word. */
|
|
32, /* 32 bits in an address. */
|
|
8, /* 8 bits in a byte. */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300h,
|
|
"h8300h", /* Architecture name. */
|
|
"h8300h", /* Printable name. */
|
|
1,
|
|
FALSE, /* The default machine. */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
&h8300s_info_struct
|
|
};
|
|
|
|
const bfd_arch_info_type bfd_h8300_arch =
|
|
{
|
|
16, /* 16 bits in a word. */
|
|
16, /* 16 bits in an address. */
|
|
8, /* 8 bits in a byte. */
|
|
bfd_arch_h8300,
|
|
bfd_mach_h8300,
|
|
"h8300", /* Architecture name. */
|
|
"h8300", /* Printable name. */
|
|
1,
|
|
TRUE, /* The default machine. */
|
|
compatible,
|
|
h8300_scan,
|
|
bfd_arch_default_fill,
|
|
&h8300h_info_struct
|
|
};
|
|
|
|
/* Pad the given address to 32 bits, converting 16-bit and 24-bit
|
|
addresses into the values they would have had on a h8s target. */
|
|
|
|
bfd_vma
|
|
bfd_h8300_pad_address (bfd *abfd, bfd_vma address)
|
|
{
|
|
/* Cope with bfd_vma's larger than 32 bits. */
|
|
address &= 0xffffffffu;
|
|
|
|
switch (bfd_get_mach (abfd))
|
|
{
|
|
case bfd_mach_h8300:
|
|
case bfd_mach_h8300hn:
|
|
case bfd_mach_h8300sn:
|
|
case bfd_mach_h8300sxn:
|
|
/* Sign extend a 16-bit address. */
|
|
if (address >= 0x8000)
|
|
return address | 0xffff0000u;
|
|
return address;
|
|
|
|
case bfd_mach_h8300h:
|
|
/* Sign extend a 24-bit address. */
|
|
if (address >= 0x800000)
|
|
return address | 0xff000000u;
|
|
return address;
|
|
|
|
case bfd_mach_h8300s:
|
|
case bfd_mach_h8300sx:
|
|
return address;
|
|
|
|
default:
|
|
abort ();
|
|
}
|
|
}
|