ports/opt (3.3): chromium: fix up a patch file should not affect us yet as it's for glibc 2.26 that we don't use yet
commit c64cc4b7d70671fb1326ec53db1b23dd0190d3b6 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Sep 7 17:25:52 2017 +1000 chromium: fix up a patch file should not affect us yet as it's for glibc 2.26 that we don't use yet diff --git a/chromium/.md5sum b/chromium/.md5sum index 1c6090932..d7f5ce4f8 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,4 +1,4 @@ -01c838202615b2223996083c7f3f9e09 breakpad-use-ucontext_t.patch +4dbc4cd98731f133a3f6e0f47625ad08 breakpad-use-ucontext_t.patch 4265aebeaeb31b88327e1b48dc580851 chromium-61.0.3163.79.tar.xz 5b5a3ad8970846d3cead13249a101283 chromium-atk-r1.patch 034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch diff --git a/chromium/.signature b/chromium/.signature index 25da46625..b39dbc0ee 100644 --- a/chromium/.signature +++ b/chromium/.signature @@ -1,12 +1,12 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UJolgbLAtnf7AazeLMTU1P1bhkBF19Lm3xcuIboD32452NvOz+uwNAYGuDcTPTwpmlBjq41Bx4EzqsiCrEZbgo= -SHA256 (Pkgfile) = 649b2148f686e28260543d81037866a28fe2e0b477a261d3a9e5b61fcbead7ed +RWSE3ohX2g5d/bhLBEj/fVXIvcPyjBTsaFffoP2ZrvUy2oHdK6dfn7uaAJ7dXKqpWA2xUOHcmjcjgcqaSczOroag5hceS6QDHwc= +SHA256 (Pkgfile) = b247971b2dedebca5c2bc370fd0c92bb6279e4421ce153912fd5c8e705187f9e SHA256 (.footprint) = 2c9b42f63b18b1aa993b3ff732bea8f1451848f7702ec1219fb2dd2550bab7a5 SHA256 (chromium-61.0.3163.79.tar.xz) = bdbc139ed86f3b5d1ec3c3b00caeaef4f9ac2c363438f03dded56e217ad10727 SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154 SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc -SHA256 (breakpad-use-ucontext_t.patch) = 8c211131bf146104ac174bba9069302075690b784f185f145a7796d2be5a520e +SHA256 (breakpad-use-ucontext_t.patch) = 6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8 SHA256 (chromium-gcc-r1.patch) = 11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58 SHA256 (chromium-gn-bootstrap-r14.patch) = 98784c4a0a793ecf34987bc8f91ae360d78596a4a59dd47651411381f752a080 SHA256 (chromium-atk-r1.patch) = fc0e9abb77b6f8e21a7601ff53f267a854736d711b530be5bbd80d976678e98d diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 70081acc1..17b672a12 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -28,12 +28,12 @@ build() { patch -p1 -i $SRC/chromium-blink-gcc7.patch # Fix build with glibc 2.26 - patch -p1 -i ../breakpad-use-ucontext_t.patch + patch -p1 -i $SRC/breakpad-use-ucontext_t.patch # Fixes from Gentoo - patch -p1 -i ../chromium-gcc-r1.patch - patch -p1 -i ../chromium-gn-bootstrap-r14.patch - patch -p1 -i ../chromium-atk-r1.patch + patch -p1 -i $SRC/chromium-gcc-r1.patch + patch -p1 -i $SRC/chromium-gn-bootstrap-r14.patch + patch -p1 -i $SRC/chromium-atk-r1.patch mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ diff --git a/chromium/breakpad-use-ucontext_t.patch b/chromium/breakpad-use-ucontext_t.patch index 2d6dec1b6..f32397236 100644 --- a/chromium/breakpad-use-ucontext_t.patch +++ b/chromium/breakpad-use-ucontext_t.patch @@ -1,282 +1,5 @@ -<!DOCTYPE html> -<html lang='en'> -<head> -<title>breakpad-use-ucontext_t.patch\trunk - svntogit/packages.git - Git clone of the 'packages' repository -</title> -<meta name='generator' content='cgit v0.12'/> -<meta name='robots' content='index, nofollow'/> -<link rel='stylesheet' type='text/css' href='/cgit.css'/> -<link rel='shortcut icon' href='/favicon.ico'/> -<link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/breakpad-use-ucon...' type='application/atom+xml'/> -<link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> -<link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> -<link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> -</head> -<body> - <div id="archnavbar"><!-- Arch Linux global navigation bar --> - <div id="archnavbarlogo"> - <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> - </div> - <div id="archnavbarmenu"> - <ul id="archnavbarlist"> - <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> - <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> - <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> - <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> - <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> - <li id="anb-sec"><a href="https://security.archlinux.org/" title="Security Tracker">Security</a></li> - <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> - <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> - </ul> - </div> - </div><!-- #archnavbar --> -<div id='cgit'><table id='header'> -<tr> -<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> -<tr><td class='sub'>Git clone of the 'packages' repository -</td><td class='sub right'></td></tr></table> -<table class='tabs'><tr><td> -<a href='/svntogit/packages.git/?h=packages/chromium'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/chromium'>refs</a><a href='/svntogit/packages.git/log/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>tree</a><a href='/svntogit/packages.git/commit/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>commit</a><a href='/svntogit/packages.git/diff/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>diff</a><a href='/svntogit/packages.git/stats/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/breakpad-use-ucontext_t.patch'> -<input type='hidden' name='h' value='packages/chromium'/><select name='qt'> -<option value='grep'>log msg</option> -<option value='author'>author</option> -<option value='committer'>committer</option> -<option value='range'>range</option> -</select> -<input class='txt' type='text' size='10' name='q' value=''/> -<input type='submit' value='search'/> -</form> -</td></tr></table> -<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/chromium'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/chromium'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>breakpad-use-ucontext_t.patch</a></div><div class='content'>blob: f32397236664bc402c3d678ba3757853167ba16d (<a href='/svntogit/packages.git/plain/trunk/breakpad-use-ucontext_t.patch?h=packages/chromium'>plain</a>) -<table summary='blob content' class='blob'> -<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> -<a id='n2' href='#n2'>2</a> -<a id='n3' href='#n3'>3</a> -<a id='n4' href='#n4'>4</a> -<a id='n5' href='#n5'>5</a> -<a id='n6' href='#n6'>6</a> -<a id='n7' href='#n7'>7</a> -<a id='n8' href='#n8'>8</a> -<a id='n9' href='#n9'>9</a> -<a id='n10' href='#n10'>10</a> -<a id='n11' href='#n11'>11</a> -<a id='n12' href='#n12'>12</a> -<a id='n13' href='#n13'>13</a> -<a id='n14' href='#n14'>14</a> -<a id='n15' href='#n15'>15</a> -<a id='n16' href='#n16'>16</a> -<a id='n17' href='#n17'>17</a> -<a id='n18' href='#n18'>18</a> -<a id='n19' href='#n19'>19</a> -<a id='n20' href='#n20'>20</a> -<a id='n21' href='#n21'>21</a> -<a id='n22' href='#n22'>22</a> -<a id='n23' href='#n23'>23</a> -<a id='n24' href='#n24'>24</a> -<a id='n25' href='#n25'>25</a> -<a id='n26' href='#n26'>26</a> -<a id='n27' href='#n27'>27</a> -<a id='n28' href='#n28'>28</a> -<a id='n29' href='#n29'>29</a> -<a id='n30' href='#n30'>30</a> -<a id='n31' href='#n31'>31</a> -<a id='n32' href='#n32'>32</a> -<a id='n33' href='#n33'>33</a> -<a id='n34' href='#n34'>34</a> -<a id='n35' href='#n35'>35</a> -<a id='n36' href='#n36'>36</a> -<a id='n37' href='#n37'>37</a> -<a id='n38' href='#n38'>38</a> -<a id='n39' href='#n39'>39</a> -<a id='n40' href='#n40'>40</a> -<a id='n41' href='#n41'>41</a> -<a id='n42' href='#n42'>42</a> -<a id='n43' href='#n43'>43</a> -<a id='n44' href='#n44'>44</a> -<a id='n45' href='#n45'>45</a> -<a id='n46' href='#n46'>46</a> -<a id='n47' href='#n47'>47</a> -<a id='n48' href='#n48'>48</a> -<a id='n49' href='#n49'>49</a> -<a id='n50' href='#n50'>50</a> -<a id='n51' href='#n51'>51</a> -<a id='n52' href='#n52'>52</a> -<a id='n53' href='#n53'>53</a> -<a id='n54' href='#n54'>54</a> -<a id='n55' href='#n55'>55</a> -<a id='n56' href='#n56'>56</a> -<a id='n57' href='#n57'>57</a> -<a id='n58' href='#n58'>58</a> -<a id='n59' href='#n59'>59</a> -<a id='n60' href='#n60'>60</a> -<a id='n61' href='#n61'>61</a> -<a id='n62' href='#n62'>62</a> -<a id='n63' href='#n63'>63</a> -<a id='n64' href='#n64'>64</a> -<a id='n65' href='#n65'>65</a> -<a id='n66' href='#n66'>66</a> -<a id='n67' href='#n67'>67</a> -<a id='n68' href='#n68'>68</a> -<a id='n69' href='#n69'>69</a> -<a id='n70' href='#n70'>70</a> -<a id='n71' href='#n71'>71</a> -<a id='n72' href='#n72'>72</a> -<a id='n73' href='#n73'>73</a> -<a id='n74' href='#n74'>74</a> -<a id='n75' href='#n75'>75</a> -<a id='n76' href='#n76'>76</a> -<a id='n77' href='#n77'>77</a> -<a id='n78' href='#n78'>78</a> -<a id='n79' href='#n79'>79</a> -<a id='n80' href='#n80'>80</a> -<a id='n81' href='#n81'>81</a> -<a id='n82' href='#n82'>82</a> -<a id='n83' href='#n83'>83</a> -<a id='n84' href='#n84'>84</a> -<a id='n85' href='#n85'>85</a> -<a id='n86' href='#n86'>86</a> -<a id='n87' href='#n87'>87</a> -<a id='n88' href='#n88'>88</a> -<a id='n89' href='#n89'>89</a> -<a id='n90' href='#n90'>90</a> -<a id='n91' href='#n91'>91</a> -<a id='n92' href='#n92'>92</a> -<a id='n93' href='#n93'>93</a> -<a id='n94' href='#n94'>94</a> -<a id='n95' href='#n95'>95</a> -<a id='n96' href='#n96'>96</a> -<a id='n97' href='#n97'>97</a> -<a id='n98' href='#n98'>98</a> -<a id='n99' href='#n99'>99</a> -<a id='n100' href='#n100'>100</a> -<a id='n101' href='#n101'>101</a> -<a id='n102' href='#n102'>102</a> -<a id='n103' href='#n103'>103</a> -<a id='n104' href='#n104'>104</a> -<a id='n105' href='#n105'>105</a> -<a id='n106' href='#n106'>106</a> -<a id='n107' href='#n107'>107</a> -<a id='n108' href='#n108'>108</a> -<a id='n109' href='#n109'>109</a> -<a id='n110' href='#n110'>110</a> -<a id='n111' href='#n111'>111</a> -<a id='n112' href='#n112'>112</a> -<a id='n113' href='#n113'>113</a> -<a id='n114' href='#n114'>114</a> -<a id='n115' href='#n115'>115</a> -<a id='n116' href='#n116'>116</a> -<a id='n117' href='#n117'>117</a> -<a id='n118' href='#n118'>118</a> -<a id='n119' href='#n119'>119</a> -<a id='n120' href='#n120'>120</a> -<a id='n121' href='#n121'>121</a> -<a id='n122' href='#n122'>122</a> -<a id='n123' href='#n123'>123</a> -<a id='n124' href='#n124'>124</a> -<a id='n125' href='#n125'>125</a> -<a id='n126' href='#n126'>126</a> -<a id='n127' href='#n127'>127</a> -<a id='n128' href='#n128'>128</a> -<a id='n129' href='#n129'>129</a> -<a id='n130' href='#n130'>130</a> -<a id='n131' href='#n131'>131</a> -<a id='n132' href='#n132'>132</a> -<a id='n133' href='#n133'>133</a> -<a id='n134' href='#n134'>134</a> -<a id='n135' href='#n135'>135</a> -<a id='n136' href='#n136'>136</a> -<a id='n137' href='#n137'>137</a> -<a id='n138' href='#n138'>138</a> -<a id='n139' href='#n139'>139</a> -<a id='n140' href='#n140'>140</a> -<a id='n141' href='#n141'>141</a> -<a id='n142' href='#n142'>142</a> -<a id='n143' href='#n143'>143</a> -<a id='n144' href='#n144'>144</a> -<a id='n145' href='#n145'>145</a> -<a id='n146' href='#n146'>146</a> -<a id='n147' href='#n147'>147</a> -<a id='n148' href='#n148'>148</a> -<a id='n149' href='#n149'>149</a> -<a id='n150' href='#n150'>150</a> -<a id='n151' href='#n151'>151</a> -<a id='n152' href='#n152'>152</a> -<a id='n153' href='#n153'>153</a> -<a id='n154' href='#n154'>154</a> -<a id='n155' href='#n155'>155</a> -<a id='n156' href='#n156'>156</a> -<a id='n157' href='#n157'>157</a> -<a id='n158' href='#n158'>158</a> -<a id='n159' href='#n159'>159</a> -<a id='n160' href='#n160'>160</a> -<a id='n161' href='#n161'>161</a> -<a id='n162' href='#n162'>162</a> -<a id='n163' href='#n163'>163</a> -<a id='n164' href='#n164'>164</a> -<a id='n165' href='#n165'>165</a> -<a id='n166' href='#n166'>166</a> -<a id='n167' href='#n167'>167</a> -<a id='n168' href='#n168'>168</a> -<a id='n169' href='#n169'>169</a> -<a id='n170' href='#n170'>170</a> -<a id='n171' href='#n171'>171</a> -<a id='n172' href='#n172'>172</a> -<a id='n173' href='#n173'>173</a> -<a id='n174' href='#n174'>174</a> -<a id='n175' href='#n175'>175</a> -<a id='n176' href='#n176'>176</a> -<a id='n177' href='#n177'>177</a> -<a id='n178' href='#n178'>178</a> -<a id='n179' href='#n179'>179</a> -<a id='n180' href='#n180'>180</a> -<a id='n181' href='#n181'>181</a> -<a id='n182' href='#n182'>182</a> -<a id='n183' href='#n183'>183</a> -<a id='n184' href='#n184'>184</a> -<a id='n185' href='#n185'>185</a> -<a id='n186' href='#n186'>186</a> -<a id='n187' href='#n187'>187</a> -<a id='n188' href='#n188'>188</a> -<a id='n189' href='#n189'>189</a> -<a id='n190' href='#n190'>190</a> -<a id='n191' href='#n191'>191</a> -<a id='n192' href='#n192'>192</a> -<a id='n193' href='#n193'>193</a> -<a id='n194' href='#n194'>194</a> -<a id='n195' href='#n195'>195</a> -<a id='n196' href='#n196'>196</a> -<a id='n197' href='#n197'>197</a> -<a id='n198' href='#n198'>198</a> -<a id='n199' href='#n199'>199</a> -<a id='n200' href='#n200'>200</a> -<a id='n201' href='#n201'>201</a> -<a id='n202' href='#n202'>202</a> -<a id='n203' href='#n203'>203</a> -<a id='n204' href='#n204'>204</a> -<a id='n205' href='#n205'>205</a> -<a id='n206' href='#n206'>206</a> -<a id='n207' href='#n207'>207</a> -<a id='n208' href='#n208'>208</a> -<a id='n209' href='#n209'>209</a> -<a id='n210' href='#n210'>210</a> -<a id='n211' href='#n211'>211</a> -<a id='n212' href='#n212'>212</a> -<a id='n213' href='#n213'>213</a> -<a id='n214' href='#n214'>214</a> -<a id='n215' href='#n215'>215</a> -<a id='n216' href='#n216'>216</a> -<a id='n217' href='#n217'>217</a> -<a id='n218' href='#n218'>218</a> -<a id='n219' href='#n219'>219</a> -<a id='n220' href='#n220'>220</a> -<a id='n221' href='#n221'>221</a> -<a id='n222' href='#n222'>222</a> -<a id='n223' href='#n223'>223</a> -<a id='n224' href='#n224'>224</a> -<a id='n225' href='#n225'>225</a> -</pre></td> -<td class='lines'><pre><code>From b6a312ed8e144a37da840ae50dbd39df5ffb7e9f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> +From b6a312ed8e144a37da840ae50dbd39df5ffb7e9f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> Date: Sun, 2 Jul 2017 16:34:54 -0700 Subject: [PATCH 2/2] replace struct ucontext with ucontext_t @@ -284,8 +7,8 @@ glibc 2.26 does not expose struct ucontext any longer Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -<span class="hl kwb">---</span> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- .../linux/dump_writer_common/ucontext_reader.cc | 30 +++++++++++----------- .../linux/dump_writer_common/ucontext_reader.h | 10 ++++---- .../src/client/linux/handler/exception_handler.cc | 8 +++--- @@ -296,220 +19,207 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc index c80724dd8..93b4d9f85 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc</span> -@@ -40,15 +40,15 @@ namespace google_breakpad { +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -40,15 +40,15 @@ namespace google_breakpad { #if defined(__i386__) -<span class="hl kwb">-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.gregs[REG_ESP]; +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_ESP]; } -<span class="hl kwb">-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.gregs[REG_EIP]; +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_EIP]; } -<span class="hl kwb">-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,</span> -<span class="hl kwa">+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,</span> +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; + const greg_t* regs = uc->uc_mcontext.gregs; -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, +@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #elif defined(__x86_64) -<span class="hl kwb">-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.gregs[REG_RSP]; +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RSP]; } -<span class="hl kwb">-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.gregs[REG_RIP]; +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RIP]; } -<span class="hl kwb">-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,</span> -<span class="hl kwa">+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,</span> +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; + const greg_t* regs = uc->uc_mcontext.gregs; -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, +@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #elif defined(__ARM_EABI__) -<span class="hl kwb">-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.arm_sp; +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_sp; } -<span class="hl kwb">-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.arm_pc; +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_pc; } -<span class="hl kwb">-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {</span> -<span class="hl kwa">+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {</span> - out->context_flags = MD_CONTEXT_ARM_FULL; +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_ARM_FULL; - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { + out->iregs[0] = uc->uc_mcontext.arm_r0; +@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { #elif defined(__aarch64__) -<span class="hl kwb">-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.sp; +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.sp; } -<span class="hl kwb">-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.pc; +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; } -<span class="hl kwb">-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,</span> -<span class="hl kwa">+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,</span> +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; + out->context_flags = MD_CONTEXT_ARM64_FULL; -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, +@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #elif defined(__mips__) -<span class="hl kwb">-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; } -<span class="hl kwb">-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {</span> -<span class="hl kwa">+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {</span> - return uc->uc_mcontext.pc; +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; } -<span class="hl kwb">-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {</span> -<span class="hl kwa">+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {</span> +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; + out->context_flags = MD_CONTEXT_MIPS64_FULL; #elif _MIPS_SIM == _ABIO32 diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h index b6e77b4b5..2369a9ad3 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h</span> -@@ -41,21 +41,21 @@ namespace google_breakpad { +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -41,21 +41,21 @@ namespace google_breakpad { // Wraps platform-dependent implementations of accessors to ucontext structs. struct UContextReader { -<span class="hl kwb">- static uintptr_t GetStackPointer(const struct ucontext* uc);</span> -<span class="hl kwa">+ static uintptr_t GetStackPointer(const ucontext_t* uc);</span> +- static uintptr_t GetStackPointer(const struct ucontext* uc); ++ static uintptr_t GetStackPointer(const ucontext_t* uc); -<span class="hl kwb">- static uintptr_t GetInstructionPointer(const struct ucontext* uc);</span> -<span class="hl kwa">+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);</span> +- static uintptr_t GetInstructionPointer(const struct ucontext* uc); ++ static uintptr_t GetInstructionPointer(const ucontext_t* uc); // Juggle a arch-specific ucontext into a minidump format // out: the minidump structure // info: the collection of register structures. #if defined(__i386__) || defined(__x86_64) -<span class="hl kwb">- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,</span> -<span class="hl kwa">+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,</span> +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fp); #elif defined(__aarch64__) -<span class="hl kwb">- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,</span> -<span class="hl kwa">+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,</span> +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs); #else -<span class="hl kwb">- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);</span> -<span class="hl kwa">+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);</span> +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); #endif }; diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc index b63f973b8..f2688acaf 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/handler/exception_handler.cc</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/handler/exception_handler.cc</span> -@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { +--- a/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/breakpad/src/client/linux/handler/exception_handler.cc +@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -<span class="hl kwb">- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));</span> -<span class="hl kwa">+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));</span> + memset(&g_crash_context_, 0, sizeof(g_crash_context_)); + memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); +- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); ++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); #if defined(__aarch64__) -<span class="hl kwb">- struct ucontext* uc_ptr = (struct ucontext*)uc;</span> -<span class="hl kwa">+ ucontext_t* uc_ptr = (ucontext_t*)uc;</span> +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -452,7 +452,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { +@@ -452,7 +452,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { // FP state is not part of user ABI on ARM Linux. // In case of MIPS Linux FP state is already part of struct ucontext - // and 'float_state' is not a member of CrashContext. -<span class="hl kwb">- struct ucontext* uc_ptr = (struct ucontext*)uc;</span> -<span class="hl kwa">+ ucontext_t* uc_ptr = (ucontext_t*)uc;</span> - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, + // and 'float_state' is not a member of CrashContext. +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { + memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, sizeof(g_crash_context_.float_state)); -@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { +@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { // ExceptionHandler::HandleSignal(). siginfo.si_code = SI_USER; siginfo.si_pid = getpid(); -<span class="hl kwb">- struct ucontext context;</span> -<span class="hl kwa">+ ucontext_t context;</span> - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); +- struct ucontext context; ++ ucontext_t context; + getcontext(&context); + return HandleSignal(sig, &siginfo, &context); } diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h index 591c31085..846df772f 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/handler/exception_handler.h</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/handler/exception_handler.h</span> -@@ -191,7 +191,7 @@ class ExceptionHandler { +--- a/breakpad/src/client/linux/handler/exception_handler.h ++++ b/breakpad/src/client/linux/handler/exception_handler.h +@@ -191,7 +191,7 @@ class ExceptionHandler { struct CrashContext { siginfo_t siginfo; pid_t tid; // the crashing thread. -<span class="hl kwb">- struct ucontext context;</span> -<span class="hl kwa">+ ucontext_t context;</span> - #if !defined(__ARM_EABI__) && !defined(__mips__) +- struct ucontext context; ++ ucontext_t context; + #if !defined(__ARM_EABI__) && !defined(__mips__) // #ifdef this out because FP state is not part of user ABI for Linux ARM. // In case of MIPS Linux FP state is already part of struct diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc index 6f5b43559..a508667a0 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc</span> -@@ -571,7 +571,7 @@ class MicrodumpWriter { +--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +@@ -571,7 +571,7 @@ class MicrodumpWriter { - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } -<span class="hl kwb">- const struct ucontext* const ucontext_;</span> -<span class="hl kwa">+ const ucontext_t* const ucontext_;</span> - #if !defined(__ARM_EABI__) && !defined(__mips__) +- const struct ucontext* const ucontext_; ++ const ucontext_t* const ucontext_; + #if !defined(__ARM_EABI__) && !defined(__mips__) const google_breakpad::fpstate_t* const float_state_; #endif diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc index 86009b9f6..f2aec73d7 100644 -<span class="hl kwb">--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc</span> -<span class="hl kwa">+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc</span> -@@ -1248,7 +1248,7 @@ class MinidumpWriter { +--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +@@ -1248,7 +1248,7 @@ class MinidumpWriter { const int fd_; // File descriptor where the minidum should be written. const char* path_; // Path to the file where the minidum should be written. -<span class="hl kwb">- const struct ucontext* const ucontext_; // also from the signal handler</span> -<span class="hl kwa">+ const ucontext_t* const ucontext_; // also from the signal handler</span> - #if !defined(__ARM_EABI__) && !defined(__mips__) +- const struct ucontext* const ucontext_; // also from the signal handler ++ const ucontext_t* const ucontext_; // also from the signal handler + #if !defined(__ARM_EABI__) && !defined(__mips__) const google_breakpad::fpstate_t* const float_state_; // ditto #endif -<span class="hl kwb">-- </span> +-- 2.13.2 -</code></pre></td></tr></table> -</div> <!-- class=content --> -<div class="foot" style="padding-left:1em;padding-right:1em;"> -<p>Copyright © 2002-2017 <a href="mailto:jvinet@zeroflux.org" -title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" -title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo -are recognized trademarks. Some rights reserved. The registered trademark -Linux® is used pursuant to a sublicense from LMI, the exclusive licensee -of Linus Torvalds, owner of the mark on a world-wide basis.</p> -</div> -</div> <!-- id=cgit --> -</body> -</html>
participants (1)
-
crux＠crux.nu