mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-03 04:12:10 +08:00
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.
185 lines
6.1 KiB
C
185 lines
6.1 KiB
C
/* BFD library support routines for the i960 architecture.
|
|
Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2005, 2006,
|
|
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 scan_960_mach
|
|
PARAMS ((const bfd_arch_info_type *, const char *));
|
|
static const bfd_arch_info_type *compatible
|
|
PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
|
|
|
|
/* This routine is provided a string, and tries to work out if it
|
|
could possibly refer to the i960 machine pointed at in the
|
|
info_struct pointer */
|
|
|
|
static bfd_boolean
|
|
scan_960_mach (ap, string)
|
|
const bfd_arch_info_type *ap;
|
|
const char *string;
|
|
{
|
|
unsigned long machine;
|
|
int fail_because_not_80960 = FALSE;
|
|
|
|
/* Look for the string i960 at the front of the string. */
|
|
if (strncasecmp ("i960", string, 4) == 0)
|
|
{
|
|
string += 4;
|
|
|
|
/* i960 on it's own means core to us. */
|
|
if (* string == 0)
|
|
return ap->mach == bfd_mach_i960_core;
|
|
|
|
/* "i960:*" is valid, anything else is not. */
|
|
if (* string != ':')
|
|
return FALSE;
|
|
|
|
string ++;
|
|
}
|
|
/* In some bfds the cpu-id is written as "80960KA", "80960KB",
|
|
"80960CA" or "80960MC". */
|
|
else if (CONST_STRNEQ (string, "80960"))
|
|
{
|
|
string += 5;
|
|
|
|
/* Set this to TRUE here. If a correct matching postfix
|
|
is detected below it will be reset to FALSE. */
|
|
fail_because_not_80960 = TRUE;
|
|
}
|
|
/* No match, can't be us. */
|
|
else
|
|
return FALSE;
|
|
|
|
if (* string == '\0')
|
|
return FALSE;
|
|
|
|
if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
|
|
string[3] == 'e' && string[4] == '\0')
|
|
machine = bfd_mach_i960_core;
|
|
else if (strcasecmp (string, "ka_sa") == 0)
|
|
machine = bfd_mach_i960_ka_sa;
|
|
else if (strcasecmp (string, "kb_sb") == 0)
|
|
machine = bfd_mach_i960_kb_sb;
|
|
else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char. */
|
|
return FALSE;
|
|
else if (string[0] == 'k' && string[1] == 'b')
|
|
{ machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = FALSE; }
|
|
else if (string[0] == 's' && string[1] == 'b')
|
|
machine = bfd_mach_i960_kb_sb;
|
|
else if (string[0] == 'm' && string[1] == 'c')
|
|
{ machine = bfd_mach_i960_mc; fail_because_not_80960 = FALSE; }
|
|
else if (string[0] == 'x' && string[1] == 'a')
|
|
machine = bfd_mach_i960_xa;
|
|
else if (string[0] == 'c' && string[1] == 'a')
|
|
{ machine = bfd_mach_i960_ca; fail_because_not_80960 = FALSE; }
|
|
else if (string[0] == 'k' && string[1] == 'a')
|
|
{ machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = FALSE; }
|
|
else if (string[0] == 's' && string[1] == 'a')
|
|
machine = bfd_mach_i960_ka_sa;
|
|
else if (string[0] == 'j' && string[1] == 'x')
|
|
machine = bfd_mach_i960_jx;
|
|
else if (string[0] == 'h' && string[1] == 'x')
|
|
machine = bfd_mach_i960_hx;
|
|
else
|
|
return FALSE;
|
|
|
|
if (fail_because_not_80960)
|
|
return FALSE;
|
|
|
|
if (machine == ap->mach)
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
/* This routine is provided two arch_infos and works out the i960
|
|
machine which would be compatible with both and returns a pointer
|
|
to its info structure */
|
|
|
|
static const bfd_arch_info_type *
|
|
compatible (a,b)
|
|
const bfd_arch_info_type *a;
|
|
const bfd_arch_info_type *b;
|
|
{
|
|
|
|
/* The i960 has distinct subspecies which may not interbreed:
|
|
CORE CA
|
|
CORE KA KB MC XA
|
|
CORE HX JX
|
|
Any architecture on the same line is compatible, the one on
|
|
the right is the least restrictive.
|
|
|
|
We represent this information in an array, each machine to a side */
|
|
|
|
#define ERROR 0
|
|
#define CORE bfd_mach_i960_core /*1*/
|
|
#define KA bfd_mach_i960_ka_sa /*2*/
|
|
#define KB bfd_mach_i960_kb_sb /*3*/
|
|
#define MC bfd_mach_i960_mc /*4*/
|
|
#define XA bfd_mach_i960_xa /*5*/
|
|
#define CA bfd_mach_i960_ca /*6*/
|
|
#define JX bfd_mach_i960_jx /*7*/
|
|
#define HX bfd_mach_i960_hx /*8*/
|
|
#define MAX_ARCH ((int)HX)
|
|
|
|
static const unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] =
|
|
{
|
|
{ ERROR, CORE, KA, KB, MC, XA, CA, JX, HX },
|
|
{ CORE, CORE, KA, KB, MC, XA, CA, JX, HX },
|
|
{ KA, KA, KA, KB, MC, XA, ERROR, ERROR, ERROR},
|
|
{ KB, KB, KB, KB, MC, XA, ERROR, ERROR, ERROR},
|
|
{ MC, MC, MC, MC, MC, XA, ERROR, ERROR, ERROR},
|
|
{ XA, XA, XA, XA, XA, XA, ERROR, ERROR, ERROR},
|
|
{ CA, CA, ERROR, ERROR, ERROR, ERROR, CA, ERROR, ERROR},
|
|
{ JX, JX, ERROR, ERROR, ERROR, ERROR, ERROR, JX, HX },
|
|
{ HX, HX, ERROR, ERROR, ERROR, ERROR, ERROR, HX, HX },
|
|
};
|
|
|
|
if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR)
|
|
{
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
return (a->mach == matrix[a->mach][b->mach]) ? a : b;
|
|
}
|
|
}
|
|
|
|
#define N(a,b,d,n) \
|
|
{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach, \
|
|
bfd_arch_default_fill, n,}
|
|
|
|
static const bfd_arch_info_type arch_info_struct[] =
|
|
{
|
|
N(bfd_mach_i960_ka_sa,"i960:ka_sa",FALSE, &arch_info_struct[1]),
|
|
N(bfd_mach_i960_kb_sb,"i960:kb_sb",FALSE, &arch_info_struct[2]),
|
|
N(bfd_mach_i960_mc, "i960:mc", FALSE, &arch_info_struct[3]),
|
|
N(bfd_mach_i960_xa, "i960:xa", FALSE, &arch_info_struct[4]),
|
|
N(bfd_mach_i960_ca, "i960:ca", FALSE, &arch_info_struct[5]),
|
|
N(bfd_mach_i960_jx, "i960:jx", FALSE, &arch_info_struct[6]),
|
|
N(bfd_mach_i960_hx, "i960:hx", FALSE, 0),
|
|
};
|
|
|
|
const bfd_arch_info_type bfd_i960_arch =
|
|
N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);
|