svn commit: r263378 - in stable/10/contrib/llvm: include/llvm/Support lib/Support

[Ed Maste]

Author: emaste
Date: Wed Mar 19 20:46:02 2014
New Revision: 263378
URL: http://svnweb.freebsd.org/changeset/base/263378

Log:
  MFC r258005: Merge upstream LLVM r192118:
  
    Formally added an explicit enum for DWARF TLS support. No functionality
    change.
  
  Sponsored by:	DARPA, AFRL

Modified:
  stable/10/contrib/llvm/include/llvm/Support/Dwarf.h
  stable/10/contrib/llvm/lib/Support/Dwarf.cpp
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/llvm/include/llvm/Support/Dwarf.h
==============================================================================
--- stable/10/contrib/llvm/include/llvm/Support/Dwarf.h	Wed Mar 19 20:40:57 2014	(r263377)
+++ stable/10/contrib/llvm/include/llvm/Support/Dwarf.h	Wed Mar 19 20:46:02 2014	(r263378)
@@ -484,6 +484,9 @@ enum dwarf_constants {
   DW_OP_lo_user = 0xe0,
   DW_OP_hi_user = 0xff,
 
+  // Extensions for GNU-style thread-local storage.
+  DW_OP_GNU_push_tls_address = 0xe0,
+
   // Extensions for Fission proposal.
   DW_OP_GNU_addr_index = 0xfb,
   DW_OP_GNU_const_index = 0xfc,

Modified: stable/10/contrib/llvm/lib/Support/Dwarf.cpp
==============================================================================
--- stable/10/contrib/llvm/lib/Support/Dwarf.cpp	Wed Mar 19 20:40:57 2014	(r263377)
+++ stable/10/contrib/llvm/lib/Support/Dwarf.cpp	Wed Mar 19 20:46:02 2014	(r263378)
@@ -453,10 +453,11 @@ const char *llvm::dwarf::OperationEncodi
   case DW_OP_bit_piece:                  return "DW_OP_bit_piece";
   case DW_OP_implicit_value:             return "DW_OP_implicit_value";
   case DW_OP_stack_value:                return "DW_OP_stack_value";
-  case DW_OP_lo_user:                    return "DW_OP_lo_user";
-  case DW_OP_hi_user:                    return "DW_OP_hi_user";
 
-    // DWARF5 Fission Proposal Op Extensions
+  // GNU thread-local storage
+  case DW_OP_GNU_push_tls_address:       return "DW_OP_GNU_push_tls_address";
+
+  // DWARF5 Fission Proposal Op Extensions
   case DW_OP_GNU_addr_index:             return "DW_OP_GNU_addr_index";
   case DW_OP_GNU_const_index:            return "DW_OP_GNU_const_index";
   }