131612 2014-04-14 03:59:37 -0700 JavaScriptCore: ARM build fix after r167094. 2015-02-05 05:15:20 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108645 131205 1 llango.u-szeged llango.u-szeged cand dbatyai.u-szeged mark.lam msaboff ossy oldest_to_newest 1000460 0 llango.u-szeged 2014-04-14 03:59:37 -0700 After r167094 there are many build errors on ARM like these: /tmp/ccgtHRno.s:370: Error: invalid constant (425a) after fixup /tmp/ccgtHRno.s:374: Error: invalid constant (426e) after fixup /tmp/ccgtHRno.s:378: Error: invalid constant (4282) after fixup /tmp/ccgtHRno.s:382: Error: invalid constant (4296) after fixup Problem is caused by the wrong generated assembly like: "\tmov r2, (" LOCAL_LABEL_STRING(llint_op_strcat) " - " LOCAL_LABEL_STRING(relativePCBase) ")\n" // /home/webkit/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:741 `mov` can only move 8bit immediate, but not every constant fit into 8 bit. We should use `mow` rather than. CLang changes `mov` to `mow` automatically, but binutils doesn't. 1000461 1 229278 llango.u-szeged 2014-04-14 04:11:51 -0700 Created attachment 229278 Patch 1000483 2 229278 galpeter 2014-04-14 07:49:04 -0700 Comment on attachment 229278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229278&action=review > Source/JavaScriptCore/ChangeLog:18 > + `mov` can only move 8 bit immediate, but not every constant fit into 8 bit. We should use `movw` rather than. The last sentence is a bit awkward for me. > Source/JavaScriptCore/ChangeLog:19 > + CLang changes `mov` to `movw` automatically, but binutils doesn't. This doesn't mention the movt, which is also important. AFAIK clang converts the mov to a single movw or a movw and a movt, depending on the immediate. > Source/JavaScriptCore/offlineasm/arm.rb:75 > + @mov_counter ||= 0 > + @mov_counter += 1 > + const_label = "_mov_constant_label#{@mov_counter}" Hmm... if we use @-s then it'll be an instance variable, and so we can end up with the same 'const_label' values. Maybe we can use $ so it'll be a global variable. Or we could skip the whole counter, because it is valid to overwrite an assembly symbol with another .equ, but that approach could make the reading/understanding of the code bit harder. 1000484 3 229283 llango.u-szeged 2014-04-14 07:51:09 -0700 Created attachment 229283 Patch 1000490 4 229283 darin 2014-04-14 08:35:05 -0700 Comment on attachment 229283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229283&action=review > Source/JavaScriptCore/offlineasm/arm.rb:78 > - $asm.puts "mov #{register.armOperand}, (#{value})" > + $mov_counter ||= 0 > + $mov_counter += 1 > + const_label = "_mov_constant_label#{$mov_counter}" > + $asm.puts ".equ #{const_label}, (#{value})" > + $asm.puts "movw #{register.armOperand}, \#:lower16:#{const_label}" > + $asm.puts "movt #{register.armOperand}, \#:upper16:#{const_label}" Won’t this hurt performance for constants that do fit into 8 bits, under clang at least? 1000515 5 229283 ossy 2014-04-14 10:03:20 -0700 Comment on attachment 229283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229283&action=review >> Source/JavaScriptCore/offlineasm/arm.rb:78 >> + $asm.puts "movw #{register.armOperand}, \#:lower16:#{const_label}" >> + $asm.puts "movt #{register.armOperand}, \#:upper16:#{const_label}" > > Won’t this hurt performance for constants that do fit into 8 bits, under clang at least? I checked the generated assembly after the proposed fix, and it seems all offsets fit in 16 bits, but none of them fit in 8 bits, so we can simple use movw always: $asm.puts "movw #{register.armOperand}, #{const_label}" Or we could ... if GNU assembler supported it ... but I got build error: Error: constant expression expected -- `movw r2,_mov_constant_label118' It's so strange ... $asm.puts "movw #{register.armOperand}, \#:lower16:#{const_label}" works fine, but doesn't work without :lower16: 1000520 6 ossy 2014-04-14 10:17:04 -0700 We can use this oneliner fix if we use :lower16: - $asm.puts "mov #{register.armOperand}, (#{value})" + $asm.puts "movw #{register.armOperand}, \#:lower16:(#{value})" But it might cause strange failures in the future once the size of the constant becomes bigger than 16 bits. 1000543 7 ossy 2014-04-14 11:03:48 -0700 Or we can use this to make sure we won't loose any information in the future: - $asm.puts "mov #{register.armOperand}, (#{value})" + $asm.puts "movw #{register.armOperand}, \#:lower16:(#{value})" + $asm.puts "movt #{register.armOperand}, \#:upper16:(#{value})" I think this extra assembly instruction won't have significant performance effect, because llint_entry runs only once to fill the entry point table. Am I right? Michael? Mark? 1000724 8 msaboff 2014-04-14 20:25:45 -0700 (In reply to comment #7) > Or we can use this to make sure we won't loose any information in the future: > - $asm.puts "mov #{register.armOperand}, (#{value})" > + $asm.puts "movw #{register.armOperand}, \#:lower16:(#{value})" > + $asm.puts "movt #{register.armOperand}, \#:upper16:(#{value})" > > I think this extra assembly instruction won't have significant > performance effect, because llint_entry runs only once to fill > the entry point table. Am I right? Michael? Mark? When I created the original patch, my research showed that mov is a pseudo op that the assembler would convert as needed to a single 8 or 16 bit immediate move or a movw/movt pair. Certainly that is what we see with clang. Gas/gcc should do the same. It is also apparent that we need 16 bits (currently 15 bits) for llint_entry. It is the case that llint_entry is intended to be run through this path only during startup. However I don't want to change all arm immediate moves to be 16 bit though, as many, possible most of the llint immediate moves have values that fit in 8 bits. Another way of handling this is to make the use of a 16 bit move predicated on an add or subtract of two labels and keep the current path for other cases. 1000725 9 229283 msaboff 2014-04-14 20:28:29 -0700 Comment on attachment 229283 Patch As explained in https://bugs.webkit.org/show_bug.cgi?id=131612#c8 1001117 10 ossy 2014-04-16 04:32:29 -0700 (In reply to comment #8) > (In reply to comment #7) > When I created the original patch, my research showed that mov is a pseudo op that the assembler would convert as needed to a single 8 or 16 bit immediate move or a movw/movt pair. Certainly that is what we see with clang. Gas/gcc should do the same. It is also apparent that we need 16 bits (currently 15 bits) for llint_entry. gas can only convert mov rn, (label1 - label2) to T1 (imm8) and T2 (imm12) and can't convert to t3 (imm16). http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0406c/index.html - A8.8.102 MOV (immediate) Using movw and movt here won't affect other 8/16 bit immediate moves, because string argument is only used for llint_entry now, nowhere else. 8/12/16 bits immediate values are handled after the string case: http://trac.webkit.org/browser/trunk/Source/JavaScriptCore/offlineasm/arm.rb#L70 > It is the case that llint_entry is intended to be run through this path only during startup. However I don't want to change all arm immediate moves to be 16 bit though, as many, possible most of the llint immediate moves have values that fit in 8 bits. > > Another way of handling this is to make the use of a 16 bit move predicated on an add or subtract of two labels and keep the current path for other cases. I think we can add a new ARM specific offline assembler instruction only for this llint_entry use case: move rn, (label1-label2) which translated to movw and movt. 1001134 11 229442 llango.u-szeged 2014-04-16 07:07:19 -0700 Created attachment 229442 Patch 1001455 12 229442 msaboff 2014-04-16 19:24:06 -0700 Comment on attachment 229442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229442&action=review > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:745 > + elsif ARM or ARMv7 or ARMv7_TRADITIONAL > + mvlbl (label - _relativePCBase), t2 > + addp t2, t1, t2 > + move index, t3 > + storep t2, [a0, t3, 4] > + elsif SH4 If the issue only manifests with ARM traditional (not Thumb2), could you make this "elsif ARM or ARMv7_TRADITIONAL"? > Source/JavaScriptCore/offlineasm/arm.rb:489 > + when "mvlbl" > + $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" > + $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" I believe that the movw is sufficient. 1002377 13 ossy 2014-04-20 06:52:15 -0700 (In reply to comment #12) > (From update of attachment 229442 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=229442&action=review > > > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:745 > > + elsif ARM or ARMv7 or ARMv7_TRADITIONAL > > + mvlbl (label - _relativePCBase), t2 > > + addp t2, t1, t2 > > + move index, t3 > > + storep t2, [a0, t3, 4] > > + elsif SH4 > > If the issue only manifests with ARM traditional (not Thumb2), could you make this "elsif ARM or ARMv7_TRADITIONAL"? No, it isn't ARM traditional issue. The bug is valid on ARM traditional and ARM Thumb2 instruction sets too. > > Source/JavaScriptCore/offlineasm/arm.rb:489 > > + when "mvlbl" > > + $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" > > + $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" > > I believe that the movw is sufficient. It is sufficient now. But what if once the difference of offsets become bigger than 16 bit? It would cause obviously wrong behaviour. Unfortunately there isn't a good way to determine if this immediate fits to 16 bit or not in build time. 1002379 14 229442 ossy 2014-04-20 06:58:59 -0700 Comment on attachment 229442 Patch Clearing flags on attachment: 229442 Committed r167566: <http://trac.webkit.org/changeset/167566> 1002380 15 ossy 2014-04-20 06:59:06 -0700 All reviewed patches have been landed. Closing bug. 1002783 16 229442 fpizlo 2014-04-21 20:16:34 -0700 Comment on attachment 229442 Patch You shouldn't be adding new instructions for this. It's straightforward to modify the lowering of "move" to realize that on ARM we need to emit the movw/movt pair in case of label differences. Second, if you're going to add an instruction for moving labels (er, label differences) into registers, then you should change setEntryAddress to use this instruction on all architectures and not make it ARM-specific. This would allow you to remove some redundant code. In the future, please put some thought into how to make your changes minimal. This is important for avoiding bugs in the future. 1056289 17 cand 2014-12-17 01:15:43 -0800 This patch broke the ARMv6 build. movw and movt are not available on v6, and other places use ldr instead, with a check for v7. https://github.com/clbr/webkitfltk/issues/7 1067083 18 ossy 2015-02-05 05:15:20 -0800 (In reply to comment #17) > This patch broke the ARMv6 build. > > movw and movt are not available on v6, and other places use ldr instead, > with a check for v7. > > https://github.com/clbr/webkitfltk/issues/7 new bug report for it: bug141288 229278 2014-04-14 04:11:51 -0700 2014-04-14 07:51:04 -0700 Patch bug-131612-20140414131129.patch text/plain 2695 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 ZjBiNTJlMjU4NzdiMzRhMGIwYjhkM2UyMTlkMWQ0MGIxZGE0YmVlLi5mYmI0YjA2MzMyNTUxZWQ2 ZDdjZTk4MjcwNmI5NWFhMmJkZDczYmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxNC0wNC0xNCAgTMOhc3psw7MgTGFuZ8OzICA8bGxhbmdvLnUtc3plZ2Vk QHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdENvcmU6IEFSTSBidWls ZCBmaXggYWZ0ZXIgcjE2NzA5NC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMTYxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFmdGVyIHIxNjcwOTQgdGhlcmUgYXJlIG1hbnkgYnVpbGQgZXJyb3JzIG9u IEFSTSBsaWtlIHRoZXNlOgorCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzcwOiBFcnJv cjogaW52YWxpZCBjb25zdGFudCAoNDI1YSkgYWZ0ZXIgZml4dXAKKyAgICAgICAgICAgIC90bXAv Y2NndEhSbm8uczozNzQ6IEVycm9yOiBpbnZhbGlkIGNvbnN0YW50ICg0MjZlKSBhZnRlciBmaXh1 cAorICAgICAgICAgICAgL3RtcC9jY2d0SFJuby5zOjM3ODogRXJyb3I6IGludmFsaWQgY29uc3Rh bnQgKDQyODIpIGFmdGVyIGZpeHVwCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzgyOiBF cnJvcjogaW52YWxpZCBjb25zdGFudCAoNDI5NikgYWZ0ZXIgZml4dXAKKworICAgICAgICBQcm9i bGVtIGlzIGNhdXNlZCBieSB0aGUgd3JvbmcgZ2VuZXJhdGVkIGFzc2VtYmx5IGxpa2U6CisgICAg ICAgICAgICAiXHRtb3YgcjIsICgiIExPQ0FMX0xBQkVMX1NUUklORyhsbGludF9vcF9zdHJjYXQp ICIgLSAiIExPQ0FMX0xBQkVMX1NUUklORyhyZWxhdGl2ZVBDQmFzZSkgIilcbiIgLy8gL2hvbWUv d2Via2l0L1dlYktpdC9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnBy ZXRlci5hc206NzQxCisKKyAgICAgICAgYG1vdmAgY2FuIG9ubHkgbW92ZSA4IGJpdCBpbW1lZGlh dGUsIGJ1dCBub3QgZXZlcnkgY29uc3RhbnQgZml0IGludG8gOCBiaXQuIFdlIHNob3VsZCB1c2Ug YG1vdndgIHJhdGhlciB0aGFuLgorICAgICAgICBDTGFuZyBjaGFuZ2VzIGBtb3ZgIHRvIGBtb3Z3 YCBhdXRvbWF0aWNhbGx5LCBidXQgYmludXRpbHMgZG9lc24ndC4KKworICAgICAgICAqIG9mZmxp bmVhc20vYXJtLnJiOgorICAgICAgICBSZXBsYWNpbmcgYG1vdmAgdG8gYG1vdndgIGlzIG5vdCBl bm91Z2gsIGJlY2F1c2UgYG1vdndgIGNhbm5vdCBtb3ZlIHJlc3VsdHMgb2YgZXhwcmVzc2lvbnMu CisgICAgICAgIFdlIGhhdmUgdG8gdXNlIGNvbnN0YW50IGxhYmVscyB3aXRoIGNvdW50ZXJzIGZv ciB0aGF0LgorCiAyMDE0LTA0LTE0ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBbSlNDXSBJbXByb3ZlIHRoZSBjYWxsIHNpdGUgb2Ygc3RyaW5nIGNv bXBhcmlzb24gaW4gc29tZSBob3QgcGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL29mZmxpbmVhc20vYXJtLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v YXJtLnJiCmluZGV4IDdkMWU0ZGExOWRkN2E4MzQ4MDE5MWFiZjk1NzkzZWIzMDhlZjM3YmIuLmM2 YmQ3ZTQxZDkzZjU3OWI0YzFjMmRjYWY1ZmUzMjk3YzcwNTQwZDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybS5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9hcm0ucmIKQEAgLTcwLDcgKzcwLDEyIEBAIEFSTV9TQ1JBVENIX0ZQ UiA9IFNwZWNpYWxSZWdpc3Rlci5uZXcoImQ2IikKIGRlZiBhcm1Nb3ZlSW1tZWRpYXRlKHZhbHVl LCByZWdpc3RlcikKICAgICAjIEN1cnJlbnRseSB3ZSBvbmx5IGhhbmRsZSB0aGUgc2ltcGxlIGNh c2VzLCBhbmQgZmFsbCBiYWNrIHRvIG1vdi9tb3Z0IGZvciB0aGUgY29tcGxleCBvbmVzLgogICAg IGlmIHZhbHVlLmlzX2E/IFN0cmluZwotICAgICAgJGFzbS5wdXRzICJtb3YgI3tyZWdpc3Rlci5h cm1PcGVyYW5kfSwgKCN7dmFsdWV9KSIKKyAgICAgIEBtb3ZfY291bnRlciB8fD0gMAorICAgICAg QG1vdl9jb3VudGVyICs9IDEKKyAgICAgIGNvbnN0X2xhYmVsID0gIl9tb3ZfY29uc3RhbnRfbGFi ZWwje0Btb3ZfY291bnRlcn0iCisgICAgICAkYXNtLnB1dHMgIi5lcXUgI3tjb25zdF9sYWJlbH0s ICgje3ZhbHVlfSkiCisgICAgICAkYXNtLnB1dHMgIm1vdncgI3tyZWdpc3Rlci5hcm1PcGVyYW5k fSwgXCM6bG93ZXIxNjoje2NvbnN0X2xhYmVsfSIKKyAgICAgICRhc20ucHV0cyAibW92dCAje3Jl Z2lzdGVyLmFybU9wZXJhbmR9LCBcIzp1cHBlcjE2OiN7Y29uc3RfbGFiZWx9IgogICAgIGVsc2lm IHZhbHVlID49IDAgJiYgdmFsdWUgPCAyNTYKICAgICAgICAgJGFzbS5wdXRzICJtb3YgI3tyZWdp c3Rlci5hcm1PcGVyYW5kfSwgXCMje3ZhbHVlfSIKICAgICBlbHNpZiAofnZhbHVlKSA+PSAwICYm ICh+dmFsdWUpIDwgMjU2Cg== 229283 2014-04-14 07:51:09 -0700 2014-04-16 07:07:10 -0700 Patch bug-131612-20140414165048.patch text/plain 2695 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 ZjBiNTJlMjU4NzdiMzRhMGIwYjhkM2UyMTlkMWQ0MGIxZGE0YmVlLi5mYmI0YjA2MzMyNTUxZWQ2 ZDdjZTk4MjcwNmI5NWFhMmJkZDczYmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxNC0wNC0xNCAgTMOhc3psw7MgTGFuZ8OzICA8bGxhbmdvLnUtc3plZ2Vk QHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdENvcmU6IEFSTSBidWls ZCBmaXggYWZ0ZXIgcjE2NzA5NC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMTYxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFmdGVyIHIxNjcwOTQgdGhlcmUgYXJlIG1hbnkgYnVpbGQgZXJyb3JzIG9u IEFSTSBsaWtlIHRoZXNlOgorCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzcwOiBFcnJv cjogaW52YWxpZCBjb25zdGFudCAoNDI1YSkgYWZ0ZXIgZml4dXAKKyAgICAgICAgICAgIC90bXAv Y2NndEhSbm8uczozNzQ6IEVycm9yOiBpbnZhbGlkIGNvbnN0YW50ICg0MjZlKSBhZnRlciBmaXh1 cAorICAgICAgICAgICAgL3RtcC9jY2d0SFJuby5zOjM3ODogRXJyb3I6IGludmFsaWQgY29uc3Rh bnQgKDQyODIpIGFmdGVyIGZpeHVwCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzgyOiBF cnJvcjogaW52YWxpZCBjb25zdGFudCAoNDI5NikgYWZ0ZXIgZml4dXAKKworICAgICAgICBQcm9i bGVtIGlzIGNhdXNlZCBieSB0aGUgd3JvbmcgZ2VuZXJhdGVkIGFzc2VtYmx5IGxpa2U6CisgICAg ICAgICAgICAiXHRtb3YgcjIsICgiIExPQ0FMX0xBQkVMX1NUUklORyhsbGludF9vcF9zdHJjYXQp ICIgLSAiIExPQ0FMX0xBQkVMX1NUUklORyhyZWxhdGl2ZVBDQmFzZSkgIilcbiIgLy8gL2hvbWUv d2Via2l0L1dlYktpdC9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnBy ZXRlci5hc206NzQxCisKKyAgICAgICAgYG1vdmAgY2FuIG9ubHkgbW92ZSA4IGJpdCBpbW1lZGlh dGUsIGJ1dCBub3QgZXZlcnkgY29uc3RhbnQgZml0IGludG8gOCBiaXQuIFdlIHNob3VsZCB1c2Ug YG1vdndgIHJhdGhlciB0aGFuLgorICAgICAgICBDTGFuZyBjaGFuZ2VzIGBtb3ZgIHRvIGBtb3Z3 YCBhdXRvbWF0aWNhbGx5LCBidXQgYmludXRpbHMgZG9lc24ndC4KKworICAgICAgICAqIG9mZmxp bmVhc20vYXJtLnJiOgorICAgICAgICBSZXBsYWNpbmcgYG1vdmAgdG8gYG1vdndgIGlzIG5vdCBl bm91Z2gsIGJlY2F1c2UgYG1vdndgIGNhbm5vdCBtb3ZlIHJlc3VsdHMgb2YgZXhwcmVzc2lvbnMu CisgICAgICAgIFdlIGhhdmUgdG8gdXNlIGNvbnN0YW50IGxhYmVscyB3aXRoIGNvdW50ZXJzIGZv ciB0aGF0LgorCiAyMDE0LTA0LTE0ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBbSlNDXSBJbXByb3ZlIHRoZSBjYWxsIHNpdGUgb2Ygc3RyaW5nIGNv bXBhcmlzb24gaW4gc29tZSBob3QgcGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL29mZmxpbmVhc20vYXJtLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v YXJtLnJiCmluZGV4IDdkMWU0ZGExOWRkN2E4MzQ4MDE5MWFiZjk1NzkzZWIzMDhlZjM3YmIuLjZm N2U3MTNiZmYzMjViNDE3MWZjZmUzZmU3MTYyYTMyYjhhNThhYWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybS5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9hcm0ucmIKQEAgLTcwLDcgKzcwLDEyIEBAIEFSTV9TQ1JBVENIX0ZQ UiA9IFNwZWNpYWxSZWdpc3Rlci5uZXcoImQ2IikKIGRlZiBhcm1Nb3ZlSW1tZWRpYXRlKHZhbHVl LCByZWdpc3RlcikKICAgICAjIEN1cnJlbnRseSB3ZSBvbmx5IGhhbmRsZSB0aGUgc2ltcGxlIGNh c2VzLCBhbmQgZmFsbCBiYWNrIHRvIG1vdi9tb3Z0IGZvciB0aGUgY29tcGxleCBvbmVzLgogICAg IGlmIHZhbHVlLmlzX2E/IFN0cmluZwotICAgICAgJGFzbS5wdXRzICJtb3YgI3tyZWdpc3Rlci5h cm1PcGVyYW5kfSwgKCN7dmFsdWV9KSIKKyAgICAgICRtb3ZfY291bnRlciB8fD0gMAorICAgICAg JG1vdl9jb3VudGVyICs9IDEKKyAgICAgIGNvbnN0X2xhYmVsID0gIl9tb3ZfY29uc3RhbnRfbGFi ZWwjeyRtb3ZfY291bnRlcn0iCisgICAgICAkYXNtLnB1dHMgIi5lcXUgI3tjb25zdF9sYWJlbH0s ICgje3ZhbHVlfSkiCisgICAgICAkYXNtLnB1dHMgIm1vdncgI3tyZWdpc3Rlci5hcm1PcGVyYW5k fSwgXCM6bG93ZXIxNjoje2NvbnN0X2xhYmVsfSIKKyAgICAgICRhc20ucHV0cyAibW92dCAje3Jl Z2lzdGVyLmFybU9wZXJhbmR9LCBcIzp1cHBlcjE2OiN7Y29uc3RfbGFiZWx9IgogICAgIGVsc2lm IHZhbHVlID49IDAgJiYgdmFsdWUgPCAyNTYKICAgICAgICAgJGFzbS5wdXRzICJtb3YgI3tyZWdp c3Rlci5hcm1PcGVyYW5kfSwgXCMje3ZhbHVlfSIKICAgICBlbHNpZiAofnZhbHVlKSA+PSAwICYm ICh+dmFsdWUpIDwgMjU2Cg== 229442 2014-04-16 07:07:19 -0700 2014-04-21 20:16:34 -0700 Patch bug-131612-20140416160657.patch text/plain 4139 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk YzJjYmI2ZjkyNWQ0Yjk5NjMyZTE3MjRjODVjMWNmMDU5MTQzZWRkLi44ZDUzYWRhNzJhZTMxMjE3 ZjJjZjYxYTc4YjkxNzc2MmZjNTNlZDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNC0wNC0xNiAgTMOhc3psw7MgTGFuZ8OzICA8bGxhbmdvLnUtc3plZ2Vk QHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdENvcmU6IEFSTSBidWls ZCBmaXggYWZ0ZXIgcjE2NzA5NC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMTYxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFmdGVyIHIxNjcwOTQgdGhlcmUgYXJlIG1hbnkgYnVpbGQgZXJyb3JzIG9u IEFSTSBsaWtlIHRoZXNlOgorCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzcwOiBFcnJv cjogaW52YWxpZCBjb25zdGFudCAoNDI1YSkgYWZ0ZXIgZml4dXAKKyAgICAgICAgICAgIC90bXAv Y2NndEhSbm8uczozNzQ6IEVycm9yOiBpbnZhbGlkIGNvbnN0YW50ICg0MjZlKSBhZnRlciBmaXh1 cAorICAgICAgICAgICAgL3RtcC9jY2d0SFJuby5zOjM3ODogRXJyb3I6IGludmFsaWQgY29uc3Rh bnQgKDQyODIpIGFmdGVyIGZpeHVwCisgICAgICAgICAgICAvdG1wL2NjZ3RIUm5vLnM6MzgyOiBF cnJvcjogaW52YWxpZCBjb25zdGFudCAoNDI5NikgYWZ0ZXIgZml4dXAKKworICAgICAgICBQcm9i bGVtIGlzIGNhdXNlZCBieSB0aGUgd3JvbmcgZ2VuZXJhdGVkIGFzc2VtYmx5IGxpa2U6CisgICAg ICAgICAgICAiXHRtb3YgcjIsICgiIExPQ0FMX0xBQkVMX1NUUklORyhsbGludF9vcF9zdHJjYXQp ICIgLSAiIExPQ0FMX0xBQkVMX1NUUklORyhyZWxhdGl2ZVBDQmFzZSkgIilcbiIgLy8gL2hvbWUv d2Via2l0L1dlYktpdC9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnBy ZXRlci5hc206NzQxCisKKyAgICAgICAgYG1vdmAgY2FuIG9ubHkgbW92ZSA4IGJpdCBpbW1lZGlh dGUsIGJ1dCBub3QgZXZlcnkgY29uc3RhbnQgZml0IGludG8gOCBiaXQuIENsYW5nIGNvbnZlcnRz CisgICAgICAgIHRoZSBtb3YgdG8gYSBzaW5nbGUgbW92dyBvciBhIG1vdncgYW5kIGEgbW92dCwg ZGVwZW5kaW5nIG9uIHRoZSBpbW1lZGlhdGUsIGJ1dCBiaW51dGlscyBkb2Vzbid0LgorICAgICAg ICBBZGQgYSBuZXcgQVJNIHNwZWNpZmljIG9mZmxpbmUgYXNzZW1ibGVyIGluc3RydWN0aW9uIChg bXZsYmxgKSBmb3IgdGhlIGZvbGxvd2luZyBsbGludF9lbnRyeQorICAgICAgICB1c2UgY2FzZTog bW92ZSBybiwgKGxhYmVsMS1sYWJlbDIpIHdoaWNoIGlzIHRyYW5zbGF0ZWQgdG8gbW92dyBhbmQg bW92dC4KKworICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtOgorICAgICAg ICAqIG9mZmxpbmVhc20vYXJtLnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vaW5zdHJ1Y3Rpb25z LnJiOgorCiAyMDE0LTA0LTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgYWRkIHRoZSBvYnZpb3VzIHRoaW5nIHRoYXQgbWFya3MgTWFrZVJv cGUgYXMgZXhpdGluZyBzaW5jZSBpdCBjYW4gZXhpdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbSBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQppbmRleCBhMDgwY2MxYWVjY2Vm NjdlMDJiOTk1NDE1ODdjZWE5MDE0MzVkMzNjLi5kMWQ3YzBkOWRlYzFlODhiY2M5ZjQ2MTI1NTM2 MGQzM2I5MTA1YzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93 TGV2ZWxJbnRlcnByZXRlci5hc20KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xv d0xldmVsSW50ZXJwcmV0ZXIuYXNtCkBAIC03MzcsMTQgKzczNywxNyBAQCBtYWNybyBzZXRFbnRy eUFkZHJlc3MoaW5kZXgsIGxhYmVsKQogICAgICAgICBwY3J0b2FkZHIgbGFiZWwsIHQxCiAgICAg ICAgIG1vdmUgaW5kZXgsIHQyCiAgICAgICAgIHN0b3JlcCB0MSwgW2EwLCB0MiwgOF0KLSAgICBl bHNpZiBBUk0gb3IgQVJNdjcgb3IgQVJNdjdfVFJBRElUSU9OQUwgb3IgU0g0CisgICAgZWxzaWYg QVJNIG9yIEFSTXY3IG9yIEFSTXY3X1RSQURJVElPTkFMCisgICAgICAgIG12bGJsIChsYWJlbCAt IF9yZWxhdGl2ZVBDQmFzZSksIHQyCisgICAgICAgIGFkZHAgdDIsIHQxLCB0MgorICAgICAgICBt b3ZlIGluZGV4LCB0MworICAgICAgICBzdG9yZXAgdDIsIFthMCwgdDMsIDRdCisgICAgZWxzaWYg U0g0CiAgICAgICAgIG1vdmUgKGxhYmVsIC0gX3JlbGF0aXZlUENCYXNlKSwgdDIKICAgICAgICAg YWRkcCB0MiwgdDEsIHQyCiAgICAgICAgIG1vdmUgaW5kZXgsIHQzCiAgICAgICAgIHN0b3JlcCB0 MiwgW2EwLCB0MywgNF0KLSAgICAgICAgaWYgU0g0Ci0gICAgICAgICAgICBmbHVzaGNwICMgRm9y Y2UgY29uc3RhbnQgcG9vbCBmbHVzaCB0byBhdm9pZCAicGNyZWwgdG9vIGZhciIgbGluayBlcnJv ci4KLSAgICAgICAgZW5kCisgICAgICAgIGZsdXNoY3AgIyBGb3JjZSBjb25zdGFudCBwb29sIGZs dXNoIHRvIGF2b2lkICJwY3JlbCB0b28gZmFyIiBsaW5rIGVycm9yLgogICAgIGVsc2lmIE1JUFMK ICAgICAgICAgY3Jhc2goKSAgIyBOZWVkIHRvIHJlcGxhY2Ugd2l0aCBjb2RlIHRvIHR1cm4gbGFi ZWwgaW50byBhbmQgYWJzb2x1dGUgYWRkcmVzcyBhbmQgc2F2ZSBhdCBpbmRleAogICAgIGVuZApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtLnJiIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtLnJiCmluZGV4IDdkMWU0ZGExOWRkN2E4 MzQ4MDE5MWFiZjk1NzkzZWIzMDhlZjM3YmIuLmM5MjI0MzYxMGUzMTQyZGFkNTVkN2I4ZGMyY2Y4 YmE2Yjk3YWI4MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L2FybS5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hcm0ucmIKQEAg LTQ4NCw2ICs0ODQsOSBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAgICAgICAgICAgZWxzZQogICAg ICAgICAgICAgICAgICRhc20ucHV0cyAibW92ICN7YXJtRmxpcHBlZE9wZXJhbmRzKG9wZXJhbmRz KX0iCiAgICAgICAgICAgICBlbmQKKyAgICAgICAgd2hlbiAibXZsYmwiCisgICAgICAgICAgICAg ICAgJGFzbS5wdXRzICJtb3Z3ICN7b3BlcmFuZHNbMV0uYXJtT3BlcmFuZH0sIFwjOmxvd2VyMTY6 I3tvcGVyYW5kc1swXS52YWx1ZX0iCisgICAgICAgICAgICAgICAgJGFzbS5wdXRzICJtb3Z0ICN7 b3BlcmFuZHNbMV0uYXJtT3BlcmFuZH0sIFwjOnVwcGVyMTY6I3tvcGVyYW5kc1swXS52YWx1ZX0i CiAgICAgICAgIHdoZW4gIm5vcCIKICAgICAgICAgICAgICRhc20ucHV0cyAibm9wIgogICAgICAg ICB3aGVuICJiaWVxIiwgImJwZXEiLCAiYmJlcSIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9vZmZsaW5lYXNtL2luc3RydWN0aW9ucy5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9vZmZsaW5lYXNtL2luc3RydWN0aW9ucy5yYgppbmRleCBkYjUzOTI1ZjI0OTAyY2JlMGJkNWY5 YjBmZTNiZTAxNTFkNDBkZjNkLi40NDI4MGU3NzZiMWNlMmE1NjNiYmQzNjZkMzcyODFmMWVkM2Iz MDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9pbnN0cnVj dGlvbnMucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vaW5zdHJ1Y3Rp b25zLnJiCkBAIC0yNjEsNyArMjYxLDggQEAgWDg2X0lOU1RSVUNUSU9OUyA9CiAKIEFSTV9JTlNU UlVDVElPTlMgPQogICAgIFsKLSAgICAgImNscmJwIgorICAgICAiY2xyYnAiLAorICAgICAibXZs YmwiCiAgICAgXQogCiBBUk02NF9JTlNUUlVDVElPTlMgPQo=