aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog22
-rw-r--r--binutils/doc/binutils.texi3
-rw-r--r--binutils/dwarf.c1
-rw-r--r--binutils/elfedit.c3
-rw-r--r--binutils/readelf.c23
-rw-r--r--binutils/testsuite/ChangeLog6
-rw-r--r--binutils/testsuite/binutils-all/elfedit-4.d16
-rw-r--r--binutils/testsuite/binutils-all/elfedit.exp4
8 files changed, 72 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 18119d8..83504ad 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,25 @@
+2011-07-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ * dwarf.c (init_dwarf_regnames): Handle EM_K1OM.
+
+ * elfedit.c (elf_machine): Support EM_K1OM.
+ (elf_class): Likewise.
+
+ * readelf.c (guess_is_rela): Handle EM_K1OM.
+ (dump_relocations): Likewise.
+ (get_machine_name): Likewise.
+ (get_section_type_name): Likewise.
+ (get_elf_section_flags): Likewise.
+ (process_section_headers): Likewise.
+ (get_symbol_index_type): Likewise.
+ (is_32bit_abs_reloc): Likewise.
+ (is_32bit_pcrel_reloc): Likewise.
+ (is_64bit_abs_reloc): Likewise.
+ (is_64bit_pcrel_reloc): Likewise.
+ (is_none_reloc): Likewise.
+
+ * doc/binutils.texi: Mention K1OM for elfedit.
+
2011-07-11 Cary Coutant <ccoutant@google.com>
PR 12983
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 64abcf2..35ccb87 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -4274,7 +4274,8 @@ Set the matching input ELF machine type to @var{machine}. If
@option{--input-mach} isn't specified, it will match any ELF
machine types.
-The supported ELF machine types are, @var{L1OM} and @var{x86-64}.
+The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
+@var{x86-64}.
@itemx --output-mach=@var{machine}
Change the ELF machine type in the ELF header to @var{machine}. The
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index f5a8d7b..08febad 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -4233,6 +4233,7 @@ init_dwarf_regnames (unsigned int e_machine)
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
init_dwarf_regnames_x86_64 ();
break;
diff --git a/binutils/elfedit.c b/binutils/elfedit.c
index 4cc2846..f7bf9e9 100644
--- a/binutils/elfedit.c
+++ b/binutils/elfedit.c
@@ -556,6 +556,8 @@ elf_machine (const char *mach)
{
if (strcasecmp (mach, "l1om") == 0)
return EM_L1OM;
+ if (strcasecmp (mach, "k1om") == 0)
+ return EM_K1OM;
if (strcasecmp (mach, "x86_64") == 0)
return EM_X86_64;
if (strcasecmp (mach, "x86-64") == 0)
@@ -576,6 +578,7 @@ elf_class (int mach)
switch (mach)
{
case EM_L1OM:
+ case EM_K1OM:
case EM_X86_64:
return ELFCLASS64;
case EM_NONE:
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 7922f8a..1271ccd 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -607,6 +607,7 @@ guess_is_rela (unsigned int e_machine)
case EM_VAX:
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
case EM_XSTORMY16:
case EM_XTENSA:
case EM_XTENSA_OLD:
@@ -1138,6 +1139,7 @@ dump_relocations (FILE * file,
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
rtype = elf_x86_64_reloc_type (type);
break;
@@ -1331,7 +1333,8 @@ dump_relocations (FILE * file,
&& psym->st_shndx == SHN_MIPS_SUNDEFINED)
sec_name = "SUNDEF";
else if ((elf_header.e_machine == EM_X86_64
- || elf_header.e_machine == EM_L1OM)
+ || elf_header.e_machine == EM_L1OM
+ || elf_header.e_machine == EM_K1OM)
&& psym->st_shndx == SHN_X86_64_LCOMMON)
sec_name = "LARGE_COMMON";
else if (elf_header.e_machine == EM_IA_64
@@ -1899,6 +1902,7 @@ get_machine_name (unsigned e_machine)
case EM_PRISM: return "Vitesse Prism";
case EM_X86_64: return "Advanced Micro Devices X86-64";
case EM_L1OM: return "Intel L1OM";
+ case EM_K1OM: return "Intel K1OM";
case EM_S390_OLD:
case EM_S390: return "IBM S/390";
case EM_SCORE: return "SUNPLUS S+Core";
@@ -3043,6 +3047,7 @@ get_section_type_name (unsigned int sh_type)
break;
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
result = get_x86_64_section_type_name (sh_type);
break;
case EM_ARM:
@@ -4294,6 +4299,7 @@ get_elf_section_flags (bfd_vma sh_flags)
case EM_486:
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
case EM_OLD_SPARCV9:
case EM_SPARC32PLUS:
case EM_SPARCV9:
@@ -4345,7 +4351,8 @@ get_elf_section_flags (bfd_vma sh_flags)
default:
if ((elf_header.e_machine == EM_X86_64
- || elf_header.e_machine == EM_L1OM)
+ || elf_header.e_machine == EM_L1OM
+ || elf_header.e_machine == EM_K1OM)
&& flag == SHF_X86_64_LARGE)
*p = 'l';
else if (flag & SHF_MASKOS)
@@ -4735,6 +4742,7 @@ process_section_headers (FILE * file)
case EM_486:
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
case EM_OLD_SPARCV9:
case EM_SPARC32PLUS:
case EM_SPARCV9:
@@ -4863,7 +4871,8 @@ process_section_headers (FILE * file)
if (!do_section_details)
{
if (elf_header.e_machine == EM_X86_64
- || elf_header.e_machine == EM_L1OM)
+ || elf_header.e_machine == EM_L1OM
+ || elf_header.e_machine == EM_K1OM)
printf (_("Key to Flags:\n\
W (write), A (alloc), X (execute), M (merge), S (strings), l (large)\n\
I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\
@@ -8783,7 +8792,8 @@ get_symbol_index_type (unsigned int type)
&& elf_header.e_ident[EI_OSABI] == ELFOSABI_HPUX)
return "ANSI_COM";
else if ((elf_header.e_machine == EM_X86_64
- || elf_header.e_machine == EM_L1OM)
+ || elf_header.e_machine == EM_L1OM
+ || elf_header.e_machine == EM_K1OM)
&& type == SHN_X86_64_LCOMMON)
return "LARGE_COM";
else if ((type == SHN_MIPS_SCOMMON
@@ -9756,6 +9766,7 @@ is_32bit_abs_reloc (unsigned int reloc_type)
return reloc_type == 1; /* R_VAX_32. */
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
return reloc_type == 10; /* R_X86_64_32. */
case EM_XC16X:
case EM_C166:
@@ -9814,6 +9825,7 @@ is_32bit_pcrel_reloc (unsigned int reloc_type)
return reloc_type == 4; /* R_TILEPRO_32_PCREL. */
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
return reloc_type == 2; /* R_X86_64_PC32. */
case EM_XTENSA_OLD:
case EM_XTENSA:
@@ -9850,6 +9862,7 @@ is_64bit_abs_reloc (unsigned int reloc_type)
return reloc_type == 54; /* R_SPARC_UA64. */
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
return reloc_type == 1; /* R_X86_64_64. */
case EM_S390_OLD:
case EM_S390:
@@ -9885,6 +9898,7 @@ is_64bit_pcrel_reloc (unsigned int reloc_type)
return reloc_type == 46; /* R_SPARC_DISP64. */
case EM_X86_64:
case EM_L1OM:
+ case EM_K1OM:
return reloc_type == 24; /* R_X86_64_PC64. */
case EM_S390_OLD:
case EM_S390:
@@ -9978,6 +9992,7 @@ is_none_reloc (unsigned int reloc_type)
case EM_CRIS: /* R_CRIS_NONE. */
case EM_X86_64: /* R_X86_64_NONE. */
case EM_L1OM: /* R_X86_64_NONE. */
+ case EM_K1OM: /* R_X86_64_NONE. */
case EM_MN10300: /* R_MN10300_NONE. */
case EM_MOXIE: /* R_MOXIE_NONE. */
case EM_M32R: /* R_M32R_NONE. */
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 7eb0361..efc1055 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ * binutils-all/elfedit.exp: Run elfedit-4.
+
+ * binutils-all/elfedit-4.d: New.
+
2011-06-30 Bernd Schmidt <bernds@codesourcery.com>
* binutils-all/objcopy.exp (strip_test, strip_executable):
diff --git a/binutils/testsuite/binutils-all/elfedit-4.d b/binutils/testsuite/binutils-all/elfedit-4.d
new file mode 100644
index 0000000..2dc8009
--- /dev/null
+++ b/binutils/testsuite/binutils-all/elfedit-4.d
@@ -0,0 +1,16 @@
+#PROG: elfedit
+#elfedit: --output-mach k1om
+#source: empty.s
+#readelf: -h
+#name: Update ELF header 1
+#target: x86_64-*-*
+
+#...
+ELF Header:
+ Magic: 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
+ Class: ELF64
+ Data: 2's complement, little endian
+ Version: 1 \(current\)
+#...
+ Machine: Intel K1OM
+#...
diff --git a/binutils/testsuite/binutils-all/elfedit.exp b/binutils/testsuite/binutils-all/elfedit.exp
index 2142774..500906d 100644
--- a/binutils/testsuite/binutils-all/elfedit.exp
+++ b/binutils/testsuite/binutils-all/elfedit.exp
@@ -1,4 +1,5 @@
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010, 2011
+# Free Software Foundation, Inc.
# 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
@@ -31,3 +32,4 @@ if ![is_remote host] {
run_dump_test "elfedit-1"
run_dump_test "elfedit-2"
run_dump_test "elfedit-3"
+run_dump_test "elfedit-4"
generated by cgit v1.1 at 2024-12-17 05:59:50 +0000