diff options
| author | emaste <emaste@FreeBSD.org> | 2014-03-19 20:46:02 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-03-19 20:46:02 +0000 |
| commit | 3b6e18f61d87eb8530acbfd755029489e94b9f9b (patch) | |
| tree | 5e61a6cafbe86471ad5504270f2b9b7603613a28 | |
| parent | 75535b28ab3b9f15489297f4f112d1119b249031 (diff) | |
| download | FreeBSD-src-3b6e18f61d87eb8530acbfd755029489e94b9f9b.zip FreeBSD-src-3b6e18f61d87eb8530acbfd755029489e94b9f9b.tar.gz | |
MFC r258005: Merge upstream LLVM r192118:
Formally added an explicit enum for DWARF TLS support. No functionality
change.
Sponsored by: DARPA, AFRL
| -rw-r--r-- | contrib/llvm/include/llvm/Support/Dwarf.h | 3 | ||||
| -rw-r--r-- | contrib/llvm/lib/Support/Dwarf.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/llvm/include/llvm/Support/Dwarf.h b/contrib/llvm/include/llvm/Support/Dwarf.h index b52914f..2491b4c 100644 --- a/contrib/llvm/include/llvm/Support/Dwarf.h +++ b/contrib/llvm/include/llvm/Support/Dwarf.h @@ -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, diff --git a/contrib/llvm/lib/Support/Dwarf.cpp b/contrib/llvm/lib/Support/Dwarf.cpp index 0f91c11..0a24883 100644 --- a/contrib/llvm/lib/Support/Dwarf.cpp +++ b/contrib/llvm/lib/Support/Dwarf.cpp @@ -453,10 +453,11 @@ const char *llvm::dwarf::OperationEncodingString(unsigned Encoding) { 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"; } |
