include/

2009-12-03  David Daney  <ddaney@caviumnetworks.com>
	Adam Nemet  <adambnemet@gmail.com>

	* elf/mips.h (E_MIPS_MACH_OCTEON2): New machine flag.
binutils/
2009-12-03  David Daney  <ddaney@caviumnetworks.com>
	Adam Nemet  <adambnemet@gmail.com>

	* readelf.c (get_machine_flags): Handle E_MIPS_MACH_OCTEON2 case.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5c43079..0f4c7db 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  David Daney  <ddaney@caviumnetworks.com>
+           Adam Nemet  <adambnemet@gmail.com>
+
+       * readelf.c (get_machine_flags): Handle E_MIPS_MACH_OCTEON2 case.
+
 2009-12-03  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/11045

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 7f64da3..92a2142 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2337,6 +2337,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
            case E_MIPS_MACH_LS2E: strcat (buf, ", loongson-2e"); break;
            case E_MIPS_MACH_LS2F: strcat (buf, ", loongson-2f"); break;
            case E_MIPS_MACH_OCTEON: strcat (buf, ", octeon"); break;
+           case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break;
            case E_MIPS_MACH_XLR:  strcat (buf, ", xlr"); break;
            case 0:
            /* We simply ignore the field in this case to avoid confusion:

diff --git a/include/ChangeLog b/include/ChangeLog
index 6e016e6..a98fb2b 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  David Daney  <ddaney@caviumnetworks.com>
+           Adam Nemet  <adambnemet@gmail.com>
+
+       * elf/mips.h (E_MIPS_MACH_OCTEON2): New machine flag.
+
 2009-11-18  Alan Modra  <amodra@bigpond.net.au>
 
        * alloca-conf.h: Clarify comment.

diff --git a/include/elf/mips.h b/include/elf/mips.h
index 1ef72bb..e30b0ab 100644 (file)
--- a/include/elf/mips.h
+++ b/include/elf/mips.h
@@ -215,6 +215,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
 #define E_MIPS_MACH_SB1         0x008a0000
 #define E_MIPS_MACH_OCTEON     0x008b0000
 #define E_MIPS_MACH_XLR        0x008c0000
+#define E_MIPS_MACH_OCTEON2    0x008d0000
 #define E_MIPS_MACH_5400       0x00910000
 #define E_MIPS_MACH_5500       0x00980000
 #define E_MIPS_MACH_9000       0x00990000