#endif
static char *default_arch = DEFAULT_ARCH;
/* Either 32 or 64, selects file format. */
-static int s390_arch_size;
-/* Current architecture. Start with the smallest instruction set. */
-static enum s390_opcode_arch_val current_architecture = S390_OPCODE_ESA;
-static int current_arch_mask = 1 << S390_OPCODE_ESA;
-static int current_arch_requested = 0;
+static int s390_arch_size = 0;
+
+static unsigned int current_mode_mask = 0;
+static unsigned int current_cpu = -1U;
/* Whether to use user friendly register names. Default is TRUE. */
#ifndef TARGET_REG_NAMES_P
size_t md_longopts_size = sizeof (md_longopts);
/* Initialize the default opcode arch and word size from the default
- architecture name. */
+ architecture name if not specified by an option. */
static void
init_default_arch ()
{
- if (current_arch_requested)
- return;
-
if (strcmp (default_arch, "s390") == 0)
{
- s390_arch_size = 32;
- current_architecture = S390_OPCODE_ESA;
+ if (s390_arch_size == 0)
+ s390_arch_size = 32;
+ if (current_mode_mask == 0)
+ current_mode_mask = 1 << S390_OPCODE_ESA;
+ if (current_cpu == -1U)
+ current_cpu = S390_OPCODE_G5;
}
else if (strcmp (default_arch, "s390x") == 0)
{
- s390_arch_size = 64;
- current_architecture = S390_OPCODE_ESAME;
+ if (s390_arch_size == 0)
+ s390_arch_size = 64;
+ if (current_mode_mask == 0)
+ current_mode_mask = 1 << S390_OPCODE_ZARCH;
+ if (current_cpu == -1U)
+ current_cpu = S390_OPCODE_Z900;
}
else
as_fatal ("Invalid default architecture, broken assembler.");
- current_arch_mask = 1 << current_architecture;
}
/* Called by TARGET_FORMAT. */
else if (arg != NULL && strcmp (arg, "64") == 0)
s390_arch_size = 64;
+ else if (arg != NULL && strcmp (arg, "esa") == 0)
+ current_mode_mask = 1 << S390_OPCODE_ESA;
+
+ else if (arg != NULL && strcmp (arg, "zarch") == 0)
+ current_mode_mask = 1 << S390_OPCODE_ZARCH;
+
+ else if (arg != NULL && strncmp (arg, "arch=", 5) == 0)
+ {
+ if (strcmp (arg + 5, "g5") == 0)
+ current_cpu = S390_OPCODE_G5;
+ else if (strcmp (arg + 5, "g6") == 0)
+ current_cpu = S390_OPCODE_G6;
+ else if (strcmp (arg + 5, "z900") == 0)
+ current_cpu = S390_OPCODE_Z900;
+ else
+ {
+ as_bad (_("invalid switch -m%s"), arg);
+ return 0;
+ }
+ }
+
else
{
as_bad (_("invalid switch -m%s"), arg);
break;
case 'A':
+ /* Option -A is deprecated. Still available for compatability. */
if (arg != NULL && strcmp (arg, "esa") == 0)
- current_architecture = S390_OPCODE_ESA;
+ current_cpu = S390_OPCODE_G5;
else if (arg != NULL && strcmp (arg, "esame") == 0)
- current_architecture = S390_OPCODE_ESAME;
+ current_cpu = S390_OPCODE_Z900;
else
as_bad ("invalid architecture -A%s", arg);
- current_arch_mask = 1 << current_architecture;
- current_arch_requested = 1;
break;
/* -V: SVR4 argument to print version ID. */
const char *retval;
/* Give a warning if the combination -m64-bit and -Aesa is used. */
- if (s390_arch_size == 64 && current_arch_mask == (1 << S390_OPCODE_ESA))
+ if (s390_arch_size == 64 && current_cpu < S390_OPCODE_Z900)
as_warn ("The 64 bit file format is used without esame instructions.");
/* Set the ELF flags if desired. */
{
static bfd_reloc_code_real_type tab2[] =
{
- [ELF_SUFFIX_NONE] BFD_RELOC_UNUSED ,
- [ELF_SUFFIX_GOT] BFD_RELOC_390_GOT16,
- [ELF_SUFFIX_PLT] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_GOTENT] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_GOTOFF] BFD_RELOC_16_GOTOFF,
- [ELF_SUFFIX_GOTPLT] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_PLTOFF] BFD_RELOC_390_PLTOFF16,
- [ELF_SUFFIX_TLS_GD] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_TLS_GOTIE] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_TLS_IE] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_TLS_LDM] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_TLS_LDO] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_TLS_LE] BFD_RELOC_UNUSED,
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_NONE */
+ BFD_RELOC_390_GOT16, /* ELF_SUFFIX_GOT */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_PLT */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_GOTENT */
+ BFD_RELOC_16_GOTOFF, /* ELF_SUFFIX_GOTOFF */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_GOTPLT */
+ BFD_RELOC_390_PLTOFF16, /* ELF_SUFFIX_PLTOFF */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_TLS_GD */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_TLS_GOTIE */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_TLS_IE */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_TLS_LDM */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_TLS_LDO */
+ BFD_RELOC_UNUSED /* ELF_SUFFIX_TLS_LE */
};
reloc = tab2[suffix];
}
{
static bfd_reloc_code_real_type tab4[] =
{
- [ELF_SUFFIX_NONE] BFD_RELOC_UNUSED ,
- [ELF_SUFFIX_GOT] BFD_RELOC_32_GOT_PCREL,
- [ELF_SUFFIX_PLT] BFD_RELOC_390_PLT32,
- [ELF_SUFFIX_GOTENT] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_GOTOFF] BFD_RELOC_32_GOTOFF,
- [ELF_SUFFIX_GOTPLT] BFD_RELOC_390_GOTPLT32,
- [ELF_SUFFIX_PLTOFF] BFD_RELOC_390_PLTOFF32,
- [ELF_SUFFIX_TLS_GD] BFD_RELOC_390_TLS_GD32,
- [ELF_SUFFIX_TLS_GOTIE] BFD_RELOC_390_TLS_GOTIE32,
- [ELF_SUFFIX_TLS_IE] BFD_RELOC_390_TLS_IE32,
- [ELF_SUFFIX_TLS_LDM] BFD_RELOC_390_TLS_LDM32,
- [ELF_SUFFIX_TLS_LDO] BFD_RELOC_390_TLS_LDO32,
- [ELF_SUFFIX_TLS_LE] BFD_RELOC_390_TLS_LE32,
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_NONE */
+ BFD_RELOC_32_GOT_PCREL, /* ELF_SUFFIX_GOT */
+ BFD_RELOC_390_PLT32, /* ELF_SUFFIX_PLT */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_GOTENT */
+ BFD_RELOC_32_GOTOFF, /* ELF_SUFFIX_GOTOFF */
+ BFD_RELOC_390_GOTPLT32, /* ELF_SUFFIX_GOTPLT */
+ BFD_RELOC_390_PLTOFF32, /* ELF_SUFFIX_PLTOFF */
+ BFD_RELOC_390_TLS_GD32, /* ELF_SUFFIX_TLS_GD */
+ BFD_RELOC_390_TLS_GOTIE32, /* ELF_SUFFIX_TLS_GOTIE */
+ BFD_RELOC_390_TLS_IE32, /* ELF_SUFFIX_TLS_IE */
+ BFD_RELOC_390_TLS_LDM32, /* ELF_SUFFIX_TLS_LDM */
+ BFD_RELOC_390_TLS_LDO32, /* ELF_SUFFIX_TLS_LDO */
+ BFD_RELOC_390_TLS_LE32 /* ELF_SUFFIX_TLS_LE */
};
reloc = tab4[suffix];
}
{
static bfd_reloc_code_real_type tab8[] =
{
- [ELF_SUFFIX_NONE] BFD_RELOC_UNUSED ,
- [ELF_SUFFIX_GOT] BFD_RELOC_390_GOT64,
- [ELF_SUFFIX_PLT] BFD_RELOC_390_PLT64,
- [ELF_SUFFIX_GOTENT] BFD_RELOC_UNUSED,
- [ELF_SUFFIX_GOTOFF] BFD_RELOC_390_GOTOFF64,
- [ELF_SUFFIX_GOTPLT] BFD_RELOC_390_GOTPLT64,
- [ELF_SUFFIX_PLTOFF] BFD_RELOC_390_PLTOFF64,
- [ELF_SUFFIX_TLS_GD] BFD_RELOC_390_TLS_GD64,
- [ELF_SUFFIX_TLS_GOTIE] BFD_RELOC_390_TLS_GOTIE64,
- [ELF_SUFFIX_TLS_IE] BFD_RELOC_390_TLS_IE64,
- [ELF_SUFFIX_TLS_LDM] BFD_RELOC_390_TLS_LDM64,
- [ELF_SUFFIX_TLS_LDO] BFD_RELOC_390_TLS_LDO64,
- [ELF_SUFFIX_TLS_LE] BFD_RELOC_390_TLS_LE64,
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_NONE */
+ BFD_RELOC_390_GOT64, /* ELF_SUFFIX_GOT */
+ BFD_RELOC_390_PLT64, /* ELF_SUFFIX_PLT */
+ BFD_RELOC_UNUSED, /* ELF_SUFFIX_GOTENT */
+ BFD_RELOC_390_GOTOFF64, /* ELF_SUFFIX_GOTOFF */
+ BFD_RELOC_390_GOTPLT64, /* ELF_SUFFIX_GOTPLT */
+ BFD_RELOC_390_PLTOFF64, /* ELF_SUFFIX_PLTOFF */
+ BFD_RELOC_390_TLS_GD64, /* ELF_SUFFIX_TLS_GD */
+ BFD_RELOC_390_TLS_GOTIE64, /* ELF_SUFFIX_TLS_GOTIE */
+ BFD_RELOC_390_TLS_IE64, /* ELF_SUFFIX_TLS_IE */
+ BFD_RELOC_390_TLS_LDM64, /* ELF_SUFFIX_TLS_LDM */
+ BFD_RELOC_390_TLS_LDO64, /* ELF_SUFFIX_TLS_LDO */
+ BFD_RELOC_390_TLS_LE64 /* ELF_SUFFIX_TLS_LE */
};
reloc = tab8[suffix];
}
as_bad (_("Unrecognized opcode: `%s'"), str);
return;
}
- else if (!(opcode->architecture & current_arch_mask))
+ else if (!(opcode->modes & current_mode_mask))
+ {
+ as_bad ("Opcode %s not available in this mode", str);
+ return;
+ }
+ else if (opcode->min_cpu > current_cpu)
{
- as_bad ("Opcode %s not available in this architecture", str);
+ as_bad ("Opcode %s not available for this cpu", str);
return;
}
projects / deliverable / binutils-gdb.git / blobdiff