diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-03-11 15:38:11 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-03-20 14:49:21 -0700 |
| commit | d41567d2ffd3413600162653c08b2365bd5bcbbf (patch) | |
| tree | aa1c212bcf816f4011315b80826acfb85ae7d9f3 /lib/Transforms/NaCl/ExpandTls.cpp | |
| parent | 23c00401dad33ca247d2818e71540079bed63c5b (diff) | |
Apply after-merge fixes to return to working state.
Diffstat (limited to 'lib/Transforms/NaCl/ExpandTls.cpp')
| -rw-r--r-- | lib/Transforms/NaCl/ExpandTls.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Transforms/NaCl/ExpandTls.cpp b/lib/Transforms/NaCl/ExpandTls.cpp index 065226fedd..929b2e0a15 100644 --- a/lib/Transforms/NaCl/ExpandTls.cpp +++ b/lib/Transforms/NaCl/ExpandTls.cpp @@ -239,9 +239,8 @@ static void rewriteTlsVars(Module &M, std::vector<VarInfo> *TlsVars, AttrBuilder B; B.addAttribute(Attribute::ReadOnly); B.addAttribute(Attribute::NoUnwind); - AttributeSet ReadTpAttrs = AttributeSet().addAttr( - M.getContext(), AttributeSet::FunctionIndex, - Attribute::get(M.getContext(), B)); + AttributeSet ReadTpAttrs = AttributeSet::get( + M.getContext(), AttributeSet::FunctionIndex, B); Constant *ReadTpFunc = M.getOrInsertTargetIntrinsic("llvm.nacl.read.tp", ReadTpType, ReadTpAttrs); |