[llvm-branch-commits] [llvm-branch] r293807 - Merging r293730:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb  1 13:45:51 2017
New Revision: 293807

URL: http://llvm.org/viewvc/llvm-project?rev=293807&view=rev
Log:
Merging r293730:
------------------------------------------------------------------------
r293730 | matze | 2017-01-31 17:31:36 -0800 (Tue, 31 Jan 2017) | 3 lines

MCMacho: Allow __thread_ptr section after dwarf sections

Differential Revision: https://reviews.llvm.org/D29315
------------------------------------------------------------------------

Added:
    llvm/branches/release_40/test/MC/MachO/ARM/no-tls-assert.ll
      - copied unchanged from r293730, llvm/trunk/test/MC/MachO/ARM/no-tls-assert.ll
Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/lib/MC/MCMachOStreamer.cpp

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 13:45:51 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,293021,293025,293230,293259,293291,293293,293309,293417,293522,293629,293658,293673,293727
+/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,293021,293025,293230,293259,293291,293293,293309,293417,293522,293629,293658,293673,293727,293730

Modified: llvm/branches/release_40/lib/MC/MCMachOStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/MC/MCMachOStreamer.cpp?rev=293807&r1=293806&r2=293807&view=diff
==============================================================================
--- llvm/branches/release_40/lib/MC/MCMachOStreamer.cpp (original)
+++ llvm/branches/release_40/lib/MC/MCMachOStreamer.cpp Wed Feb  1 13:45:51 2017
@@ -142,7 +142,8 @@ static bool canGoAfterDWARF(const MCSect
   if (SegName == "__TEXT" && SecName == "__eh_frame")
     return true;
 
-  if (SegName == "__DATA" && SecName == "__nl_symbol_ptr")
+  if (SegName == "__DATA" && (SecName == "__nl_symbol_ptr" ||
+                              SecName == "__thread_ptr"))
     return true;
 
   return false;