svn commit: r280473 - in projects/lld-import/contrib/llvm: include/llvm/Support lib/Target/Mips/MCTargetDesc

[Dimitry Andric]

Author: dim
Date: Tue Mar 24 22:38:04 2015
New Revision: 280473
URL: https://svnweb.freebsd.org/changeset/base/280473

Log:
  Pull in r227044 from upstream llvm trunk (by Simon Atanasyan):
  
    [Mips] Add .MIPS.options section descriptor kinds enumeration
  
    No functional changes.
  
  This is a prerequisite for building lld trunk.

Modified:
  projects/lld-import/contrib/llvm/include/llvm/Support/ELF.h
  projects/lld-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp

Modified: projects/lld-import/contrib/llvm/include/llvm/Support/ELF.h
==============================================================================
--- projects/lld-import/contrib/llvm/include/llvm/Support/ELF.h	Tue Mar 24 22:36:52 2015	(r280472)
+++ projects/lld-import/contrib/llvm/include/llvm/Support/ELF.h	Tue Mar 24 22:38:04 2015	(r280473)
@@ -475,6 +475,22 @@ enum {
   STO_MIPS_MIPS16          = 0xf0   // MIPS Specific ISA for Mips16
 };
 
+// .MIPS.options section descriptor kinds
+enum {
+  ODK_NULL       = 0,   // Undefined
+  ODK_REGINFO    = 1,   // Register usage information
+  ODK_EXCEPTIONS = 2,   // Exception processing options
+  ODK_PAD        = 3,   // Section padding options
+  ODK_HWPATCH    = 4,   // Hardware patches applied
+  ODK_FILL       = 5,   // Linker fill value
+  ODK_TAGS       = 6,   // Space for tool identification
+  ODK_HWAND      = 7,   // Hardware AND patches applied
+  ODK_HWOR       = 8,   // Hardware OR patches applied
+  ODK_GP_GROUP   = 9,   // GP group to use for text/data sections
+  ODK_IDENT      = 10,  // ID information
+  ODK_PAGESIZE   = 11   // Page size information
+};
+
 // Hexagon Specific e_flags
 // Release 5 ABI
 enum {

Modified: projects/lld-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp
==============================================================================
--- projects/lld-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp	Tue Mar 24 22:36:52 2015	(r280472)
+++ projects/lld-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp	Tue Mar 24 22:38:04 2015	(r280473)
@@ -34,7 +34,7 @@ void MipsRegInfoRecord::EmitMipsOptionRe
     MCA.getOrCreateSectionData(*Sec).setAlignment(8);
     Streamer->SwitchSection(Sec);
 
-    Streamer->EmitIntValue(1, 1);  // kind
+    Streamer->EmitIntValue(ELF::ODK_REGINFO, 1);  // kind
     Streamer->EmitIntValue(40, 1); // size
     Streamer->EmitIntValue(0, 2);  // section
     Streamer->EmitIntValue(0, 4);  // info