From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Keith David Bershatsky Newsgroups: gmane.emacs.devel Subject: Re: Emacs 28 on OSX: emacsclient.c:1415: warning: implicit declaration of function 'openat' Date: Wed, 20 Apr 2022 17:51:32 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Wed_Apr_20_17:51:32_2022-1" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20013"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Po Lu , Mattias =?UTF-8?B?RW5n?= =?UTF-8?B?ZGVnw6VyZA==?= , Paul Eggert , emacs-devel@gnu.org To: Alan Third Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Apr 21 02:53:01 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nhL48-0004zR-Dt for ged-emacs-devel@m.gmane-mx.org; Thu, 21 Apr 2022 02:53:01 +0200 Original-Received: from localhost ([::1]:33908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhL46-0002Vv-Vv for ged-emacs-devel@m.gmane-mx.org; Wed, 20 Apr 2022 20:52:59 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhL2o-0001nj-QM for emacs-devel@gnu.org; Wed, 20 Apr 2022 20:51:38 -0400 Original-Received: from gateway31.websitewelcome.com ([192.185.143.31]:28993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhL2m-0002SL-0l for emacs-devel@gnu.org; Wed, 20 Apr 2022 20:51:38 -0400 Original-Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 7C96D3A476 for ; Wed, 20 Apr 2022 19:51:34 -0500 (CDT) Original-Received: from gator3053.hostgator.com ([50.87.144.69]) by cmsmtp with SMTP id hL2knDx7ydx86hL2knHn8T; Wed, 20 Apr 2022 19:51:34 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lawlist.com ; s=default; h=Content-Type:MIME-Version:Subject:Cc:To:From:Message-ID:Date: Sender:Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=puivywtsczqkPcKMFEgHNXnZOin4/Vnuf0bxYopUNvE=; b=S5XM95sqpu5dT3hjOYSRn3PFJN 6hbe3DPrzuqjlUOyqkjZSvwylbi7OXwVMCTqpCUhtlvQED7mK4mpicg+dC+2nqk1ObdKLCrJgAjYZ iODosWL97eEQ75NcZ6PDy19VqYFT7Ij/qp7vMJGxBgA0RnOsHhg9sls70iagXdtSLB/9wmJz8Afwj 3KAYZlfKYRunZCwSe4bV7BJMwi11EPV2eBqXfRLqujcFOp0e0hM5ppKM6Wb4F6ZAjsFv2Sz0CK7l2 sLVsUbJg83VwZ/X+5Wkz0hTNuGY7DRGAkxuf6JaW/8OAA9wpI0hXFHJN+SxvE9mG2besSeRl8udrc 0EHeCi8g==; Original-Received: from cpe-45-48-245-70.socal.res.rr.com ([45.48.245.70]:50128 helo=server.local) by gator3053.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nhL2j-002hDt-Ho; Wed, 20 Apr 2022 19:51:33 -0500 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator3053.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lawlist.com X-BWhitelist: no X-Source-IP: 45.48.245.70 X-Source-L: No X-Exim-ID: 1nhL2j-002hDt-Ho X-Source-Sender: cpe-45-48-245-70.socal.res.rr.com (server.local) [45.48.245.70]:50128 X-Source-Auth: lawlist X-Email-Count: 2 X-Source-Cap: bGF3bGlzdDtsYXdsaXN0O2dhdG9yMzA1My5ob3N0Z2F0b3IuY29t X-Local-Domain: yes Received-SPF: pass client-ip=192.185.143.31; envelope-from=esq@lawlist.com; helo=gateway31.websitewelcome.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:288733 Archived-At: --Multipart_Wed_Apr_20_17:51:32_2022-1 Content-Type: text/plain; charset=US-ASCII Emacs master (as of commit f98c3f4426fecf794f47f27aebe1f3b854fb1bfd) now builds successfully on OSX 10.6.8 using all of the recent patches, plus the suggestion by Po to use the number 1068 instead of 1060 in nsterm.m. Emacs crashes, however, when trying to launch it. To help keep track of where I believe we are in the evolution of patches, I have attached what I believe to be a combined patch of the work done by Alan and Po, plus the modification of number 1060 to 1068 in nsterm.m. Here is a backtrace: Last login: Wed Apr 20 16:44:00 on console server:~ HOME$ ulimit -S -s unlimitedserver:~ HOME$ cd /Users/HOME/Desktop/emacs/srcserver:src HOME$ /Users/HOME/.0.data/.0.emacs/.0.macports_2_3_3/bin/ggdb_mp /Users/HOME/Desktop/emacs/nextstep/Emacs.app/Contents/MacOS/EmacsGNU gdb (GDB) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-apple-darwin10.8.0". Type "show configuration" for configuration details. For bug reporting instructions, please see: . Find the GDB manual and other documentation resources online at: . For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /Users/HOME/Desktop/emacs/nextstep/Emacs.app/Contents/MacOS/Emacs...done. SIGINT is used by the debugger. Are you sure you want to change it? (y or n) [answered Y; input not from terminal] DISPLAY = /tmp/launch-dmF4wz/org.x:0 TERM = xterm-color Breakpoint 1 at 0x1000e9ee0: file emacs.c, line 421. (gdb) run Starting program: /Users/HOME/Desktop/emacs/nextstep/Emacs.app/Contents/MacOS/Emacs 2022-04-20 17:40:18.996 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x100918460 of class NSPathStore2 autoreleased with no pool in place - just leaking 2022-04-20 17:40:18.998 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x10091c290 of class NSPathStore2 autoreleased with no pool in place - just leaking 2022-04-20 17:40:18.998 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x1009185f0 of class NSCFString autoreleased with no pool in place - just leaking 2022-04-20 17:40:18.998 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x10091cc40 of class NSCFArray autoreleased with no pool in place - just leaking 2022-04-20 17:40:18.999 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x10091cd30 of class NSPathStore2 autoreleased with no pool in place - just leaking 2022-04-20 17:40:18.999 Emacs[29141:60f] *** __NSAutoreleaseNoPool(): Object 0x10091ce90 of class NSCFData autoreleased with no pool in place - just leaking [New Thread 0x1903 of process 29141] [New Thread 0x1a03 of process 29141] [New Thread 0x1b03 of process 29141] 2022-04-20 17:40:19.560 Emacs[29141:60f] An uncaught exception was raised 2022-04-20 17:40:19.560 Emacs[29141:60f] *** -getRed:green:blue:alpha: not defined for the NSColor NSCustomColorSpace Device RGB colorspace 0 0 0 1; need to first convert colorspace. 2022-04-20 17:40:19.561 Emacs[29141:60f] *** Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: '*** -getRed:green:blue:alpha: not defined for the NSColor NSCustomColorSpace Device RGB colorspace 0 0 0 1; need to first convert colorspace.' *** Call stack at first throw: ( 0 CoreFoundation 0x00007fff899577b4 __exceptionPreprocess + 180 1 libobjc.A.dylib 0x00007fff8012bf03 objc_exception_throw + 45 2 CoreFoundation 0x00007fff899575d7 +[NSException raise:format:arguments:] + 103 3 CoreFoundation 0x00007fff89957564 +[NSException raise:format:] + 148 4 Emacs 0x000000010021cc44 -[NSColor(EmacsColor) unsignedLong] + 36 5 Emacs 0x00000001002343ff ns_set_foreground_color + 127 6 Emacs 0x0000000100018391 gui_set_frame_parameters + 1553 7 Emacs 0x000000010001965e gui_default_parameter + 174 8 Emacs 0x000000010023952f Fx_create_frame + 1631 9 Emacs 0x000000010018c5d0 funcall_subr + 480 10 Emacs 0x00000001001d98ed exec_byte_code + 11085 11 Emacs 0x000000010018aa44 Ffuncall + 324 12 Emacs 0x000000010018e004 Fapply + 756 13 Emacs 0x000000010018c470 funcall_subr + 128 14 Emacs 0x00000001001d98ed exec_byte_code + 11085 15 Emacs 0x000000010018f426 apply_lambda + 262 16 Emacs 0x0000000100189509 eval_sub + 1481 17 Emacs 0x000000010018f09d Feval + 61 18 Emacs 0x0000000100186653 internal_condition_case + 99 19 Emacs 0x00000001000efac8 top_level_1 + 88 20 Emacs 0x00000001001866d7 internal_catch + 87 21 Emacs 0x00000001000ef9d8 command_loop + 184 22 Emacs 0x00000001000f3ef6 recursive_edit_1 + 182 23 Emacs 0x00000001000f40d4 Frecursive_edit + 244 24 Emacs 0x00000001000eb5a5 main + 4805 25 Emacs 0x00000001000015c4 start + 52 26 ??? 0x0000000000000001 0x0 + 1 ) terminate called after throwing an instance of 'NSException' [New Thread 0x1c03 of process 29141] Program received signal SIGABRT, Aborted. 0x00007fff8a6120b6 in t.2065 () from /usr/lib/libSystem.B.dylib (gdb) bt #0 0x00007fff8a6120b6 in t.2065 () from /usr/lib/libSystem.B.dylib #1 0x00007fff8a6b29f6 in t.2066 () from /usr/lib/libSystem.B.dylib #2 0x00007fff838465d2 in ?? () from /usr/lib/libstdc++.6.dylib #3 0x00007fff8012fb39 in ?? () from /usr/lib/libobjc.A.dylib #4 0x00007fff83844ae1 in ?? () from /usr/lib/libstdc++.6.dylib #5 0x00007fff83844b16 in ?? () from /usr/lib/libstdc++.6.dylib #6 0x00007fff83844bfc in ?? () from /usr/lib/libstdc++.6.dylib #7 0x00007fff8012bfa2 in ?? () from /usr/lib/libobjc.A.dylib #8 0x00007fff899575d7 in +[NSException raise:format:arguments:] () from /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation #9 0x00007fff89957564 in +[NSException raise:format:] () from /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation #10 0x000000010021cc44 in -[NSColor(EmacsColor) unsignedLong] (self=0x71d5, _cmd=) at nsterm.m:182 #11 0x00000001002343ff in ns_set_foreground_color (f=0x101166830, arg=XIL(0x103627364), oldval=XIL(0)) at nsfns.m:255 #12 0x0000000100018391 in gui_set_frame_parameters (f=0x71d5, alist=) at frame.c:4274 #13 0x000000010001965e in gui_default_parameter (f=0x101166830, alist=, prop=XIL(0x69c0), deflt=XIL(0x103627364), xprop=, xclass=, type=RES_TYPE_STRING) at frame.c:5469 #14 0x000000010023952f in Fx_create_frame (parms=XIL(0x1011037b3)) at nsfns.m:1282 #15 0x000000010018c5d0 in funcall_subr (subr=0x10067ef00, numargs=1, args=0x7fff5fbfeb88) at eval.c:2911 #16 0x00000001001d98ed in exec_byte_code (fun=XIL(0x71d5), args_template=6, nargs=0, args=0x7fff5fbfeb88) at bytecode.c:809 #17 0x000000010018aa44 in Ffuncall (nargs=, args=0x104800208) at eval.c:2873 #18 0x000000010018e004 in Fapply (nargs=2, args=0x104800208) at eval.c:2507 #19 0x000000010018c470 in funcall_subr (subr=0x1006784c0, numargs=2, args=0x7fff5fbfeb88) at eval.c:2938 #20 0x00000001001d98ed in exec_byte_code (fun=XIL(0x71d5), args_template=6, nargs=0, args=0x7fff5fbfeb88) at bytecode.c:809 #21 0x000000010018f426 in apply_lambda (fun=XIL(0x102a067c5), args=XIL(0), count=...) at eval.c:2982 #22 0x0000000100189509 in eval_sub (form=) at eval.c:2472 #23 0x000000010018f09d in Feval (form=XIL(0x102fe1cab), lexical=) at eval.c:2240 #24 0x0000000100186653 in internal_condition_case ( bfun=0x1000ef900 , handlers=, hfun=0x1000f0860 ) at eval.c:1450 #25 0x00000001000efac8 in top_level_1 (ignore=) at keyboard.c:1159 #26 0x00000001001866d7 in internal_catch (tag=, func=0x1000efa70 , arg=XIL(0)) at eval.c:1180 #27 0x00000001000ef9d8 in command_loop () at keyboard.c:1119 #28 0x00000001000f3ef6 in recursive_edit_1 () at keyboard.c:729 #29 0x00000001000f40d4 in Frecursive_edit () at keyboard.c:812 #30 0x00000001000eb5a5 in main (argc=1, argv=0x7fff5fbff960) at emacs.c:2474 Lisp Backtrace: Cannot access memory at address 0x74b78 (gdb) --Multipart_Wed_Apr_20_17:51:32_2022-1 Content-Type: application/diff; type=patch Content-Disposition: attachment; filename="combined_patches_2020_04_20_a.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9tYWNmb250Lm0gYi9zcmMvbWFjZm9udC5tCmluZGV4IDM0ZTQ4YWYu LmVhYWM0N2UgMTAwNjQ0Ci0tLSBhL3NyYy9tYWNmb250Lm0KKysrIGIvc3JjL21hY2ZvbnQubQpA QCAtMzU3MCwxOCArMzU3MCwxNyBAQCBTbyB3ZSB1c2UgQ1RGb250RGVzY3JpcHRvckNyZWF0ZU1h dGNoaW5nRm9udERlc2NyaXB0b3IgKG5vCiAKICAgICAgIGlmIChsYW5ndWFnZXMgJiYgQ0ZBcnJh eUdldENvdW50IChsYW5ndWFnZXMpID4gMCkKICAgICAgICAgewotICAgICAgICAgIGlmIChbW05T UHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dCi0gICAgICAgICAgICAgICAgaXNPcGVyYXRpbmdTeXN0 ZW1BdExlYXN0VmVyc2lvbjoKLSAgICAgICAgICAgICAgICAgICgoTlNPcGVyYXRpbmdTeXN0ZW1W ZXJzaW9uKXsKLSAgICAgICAgICAgICAgICAgICAgLm1ham9yVmVyc2lvbiA9IDEwLCAubWlub3JW ZXJzaW9uID0gOX0pXSkKLSAgICAgICAgICAgIHZhbHVlc1tudW1fdmFsdWVzKytdID0gQ0ZBcnJh eUdldFZhbHVlQXRJbmRleCAobGFuZ3VhZ2VzLCAwKTsKLSAgICAgICAgICBlbHNlCisjaWYgTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDkwMAorICAgICAgICAgIGlmIChDVEdldENv cmVUZXh0VmVyc2lvbiAoKSA8IGtDVFZlcnNpb25OdW1iZXIxMF85KQogICAgICAgICAgICAgewog ICAgICAgICAgICAgICBDRkNoYXJhY3RlclNldFJlZiBjaGFyc2V0ID0KICAgICAgICAgICAgICAg ICBDRkRpY3Rpb25hcnlHZXRWYWx1ZSAoYXR0cmlidXRlcywga0NURm9udENoYXJhY3RlclNldEF0 dHJpYnV0ZSk7CiAKICAgICAgICAgICAgICAgcmVzdWx0ID0gbWFjX2ZvbnRfY29weV9kZWZhdWx0 X25hbWVfZm9yX2NoYXJzZXRfYW5kX2xhbmd1YWdlcyAoY2hhcnNldCwgbGFuZ3VhZ2VzKTsKICAg ICAgICAgICAgIH0KKyAgICAgICAgICBlbHNlCisjZW5kaWYKKyAgICAgICAgICAgIHZhbHVlc1tu dW1fdmFsdWVzKytdID0gQ0ZBcnJheUdldFZhbHVlQXRJbmRleCAobGFuZ3VhZ2VzLCAwKTsKICAg ICAgICAgfQogICAgICAgaWYgKHJlc3VsdCA9PSBOVUxMKQogICAgICAgICB7CmRpZmYgLS1naXQg YS9zcmMvbnNtZW51Lm0gYi9zcmMvbnNtZW51Lm0KaW5kZXggODFkN2NkMi4uMGY3ZDFmYiAxMDA2 NDQKLS0tIGEvc3JjL25zbWVudS5tCisrKyBiL3NyYy9uc21lbnUubQpAQCAtNjQ5LDcgKzY0OSw4 IEBAIC0gKHZvaWQpZmlsbFdpdGhXaWRnZXRWYWx1ZTogKHZvaWQgKil3dnB0cgogICAgICB3b3Jr IGFyb3VuZCBpdCBieSB1c2luZyB0YWJzIHRvIHNwbGl0IHRoZSB0aXRsZSBpbnRvIHR3bwogICAg ICBjb2x1bW5zLiAgKi8KICAgTlNGb250ICptZW51Rm9udCA9IFtOU0ZvbnQgbWVudUZvbnRPZlNp emU6MF07Ci0gIE5TRGljdGlvbmFyeSAqZm9udF9hdHRyaWJzID0gQHtOU0ZvbnRBdHRyaWJ1dGVO YW1lOiBtZW51Rm9udH07CisgIE5TRGljdGlvbmFyeSAqZm9udF9hdHRyaWJzID0gW05TRGljdGlv bmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdHNBbmRLZXlzOgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtZW51Rm9udCwgTlNGb250QXR0cmlidXRlTmFtZSwg bmlsXTsKICAgQ0dGbG9hdCBtYXhOYW1lV2lkdGggPSAwOwogICBDR0Zsb2F0IG1heEtleVdpZHRo ID0gMDsKIApAQCAtNjc3LDExICs2NzgsMTIgQEAgLSAodm9pZClmaWxsV2l0aFdpZGdldFZhbHVl OiAodm9pZCAqKXd2cHRyCiAgIE5TVGV4dFRhYiAqdGFiID0KICAgICBbW1tOU1RleHRUYWIgYWxs b2NdIGluaXRXaXRoVGV4dEFsaWdubWVudDogTlNUZXh0QWxpZ25tZW50UmlnaHQKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2NhdGlvbjogbWF4V2lkdGgKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9uczogQHt9XSBhdXRvcmVsZWFzZV07 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6IFtOU0RpY3Rp b25hcnkgZGljdGlvbmFyeV1dIGF1dG9yZWxlYXNlXTsKICAgTlNNdXRhYmxlUGFyYWdyYXBoU3R5 bGUgKnBzdHlsZSA9IFtbW05TTXV0YWJsZVBhcmFncmFwaFN0eWxlIGFsbG9jXSBpbml0XQogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvcmVsZWFzZV07Ci0gIFtwc3R5 bGUgc2V0VGFiU3RvcHM6IEBbdGFiXV07Ci0gIGF0dHJpYnV0ZXMgPSBAe05TUGFyYWdyYXBoU3R5 bGVBdHRyaWJ1dGVOYW1lOiBwc3R5bGV9OworICBbcHN0eWxlIHNldFRhYlN0b3BzOiBbTlNBcnJh eSBhcnJheVdpdGhPYmplY3Q6dGFiXV07CisgIGF0dHJpYnV0ZXMgPSBbTlNEaWN0aW9uYXJ5IGRp Y3Rpb25hcnlXaXRoT2JqZWN0c0FuZEtleXM6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcHN0eWxlLCBOU1BhcmFncmFwaFN0eWxlQXR0cmlidXRlTmFtZSwgbmlsXTsKICNlbmRpZgog CiAgIC8qIGNsZWFyIGV4aXN0aW5nIGNvbnRlbnRzICovCmRpZmYgLS1naXQgYS9zcmMvbnN0ZXJt LmggYi9zcmMvbnN0ZXJtLmgKaW5kZXggNGNiYTVjMC4uYmY1YmE3ZCAxMDA2NDQKLS0tIGEvc3Jj L25zdGVybS5oCisrKyBiL3NyYy9uc3Rlcm0uaApAQCAtMTI5MSw3ICsxMjkxLDcgQEAgI2RlZmlu ZSBOU0FsZXJ0U3R5bGVDcml0aWNhbCAgICAgICAgICAgICAgIE5TQ3JpdGljYWxBbGVydFN0eWxl CiAjZGVmaW5lIE5TQ29udHJvbFNpemVSZWd1bGFyICAgICAgICAgICAgICAgTlNSZWd1bGFyQ29u dHJvbFNpemUKICNkZWZpbmUgTlNDb21wb3NpdGluZ09wZXJhdGlvbkNvcHkgICAgICAgICBOU0Nv bXBvc2l0ZUNvcHkKIAotLyogQW5kIGFkZHMgTlNXaW5kb3dTdHlsZU1hc2suICAqLworI2RlZmlu ZSBOU1RleHRBbGlnbm1lbnRSaWdodCAgICAgICAgICAgICAgIE5TUmlnaHRUZXh0QWxpZ25tZW50 CiAjaWZkZWYgX19PQkpDX18KIHR5cGVkZWYgTlNVSW50ZWdlciBOU1dpbmRvd1N0eWxlTWFzazsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvc3JjL25zdGVybS5tIGIvc3JjL25zdGVybS5tCmluZGV4IDVh NmE0ZDYuLmI3NDM0ZTcgMTAwNjQ0Ci0tLSBhL3NyYy9uc3Rlcm0ubQorKysgYi9zcmMvbnN0ZXJt Lm0KQEAgLTc1MSw3ICs3NTEsMTkgQEAgRnJlZSBhIHBvb2wgYW5kIHRlbXBvcmFyeSBvYmplY3Rz IGl0IHJlZmVycyB0byAoY2FsbGFibGUgZnJvbSBDKQogICAgICAgRW1hY3NWaWV3ICpwYXJlbnRW aWV3ID0gRlJBTUVfTlNfVklFVyAoRlJBTUVfUEFSRU5UX0ZSQU1FIChmKSk7CiAgICAgICBwYXJl bnRSZWN0ID0gW3BhcmVudFZpZXcgY29udmVydFJlY3Q6W3BhcmVudFZpZXcgZnJhbWVdCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0b1ZpZXc6bmlsXTsKLSAgICAgIHBhcmVu dFJlY3QgPSBbW3BhcmVudFZpZXcgd2luZG93XSBjb252ZXJ0UmVjdFRvU2NyZWVuOnBhcmVudFJl Y3RdOworI2lmIE1BQ19PU19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTA3MAorI2lmIE1BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTA3MAorICAgICAgaWYgKFtbcGFyZW50VmlldyB3 aW5kb3ddIHJlc3BvbmRzVG9TZWxlY3RvcjogQHNlbGVjdG9yKGNvbnZlcnRSZWN0VG9TY3JlZW46 KV0pCisjZW5kaWYKKyBwYXJlbnRSZWN0ID0gW1twYXJlbnRWaWV3IHdpbmRvd10gY29udmVydFJl Y3RUb1NjcmVlbjogcGFyZW50UmVjdF07CisjaWYgTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPCAxMDcwCisgICAgICBlbHNlCisjZW5kaWYKKyNlbmRpZiAvKiBNQUNfT1NfWF9WRVJTSU9O X01BWF9BTExPV0VEID49IDEwNzAgKi8KKyNpZiBNQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA8IDEwNzAgXAorICB8fCBkZWZpbmVkIChOU19JTVBMX0dOVVNURVApCisgcGFyZW50UmVjdC5v cmlnaW4gPSBbW3BhcmVudFZpZXcgd2luZG93XSBjb252ZXJ0QmFzZVRvU2NyZWVuOiBwYXJlbnRS ZWN0Lm9yaWdpbl07CisjZW5kaWYKICAgICB9CiAgIGVsc2UKICAgICBwYXJlbnRSZWN0ID0gW1tb TlNTY3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV07CkBAIC03ODgsOCArODAw LDE1IEBAIEZyZWUgYSBwb29sIGFuZCB0ZW1wb3Jhcnkgb2JqZWN0cyBpdCByZWZlcnMgdG8gKGNh bGxhYmxlIGZyb20gQykKIGRvdWJsZQogbnNfZnJhbWVfc2NhbGVfZmFjdG9yIChzdHJ1Y3QgZnJh bWUgKmYpCiB7Ci0jaWYgZGVmaW5lZCAoTlNfSU1QTF9DT0NPQSkgJiYgTUFDX09TX1hfVkVSU0lP Tl9NQVhfQUxMT1dFRCA+IDEwNjAKLSAgcmV0dXJuIFtbRlJBTUVfTlNfVklFVyAoZikgd2luZG93 XSBiYWNraW5nU2NhbGVGYWN0b3JdOworI2lmIGRlZmluZWQgKE5TX0lNUExfQ09DT0EpICYmIE1B Q19PU19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPiAxMDY4CisjaWYgTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPCAxMDcwCisgIGlmIChbW0ZSQU1FX05TX1ZJRVcgKGYpIHdpbmRvd10gcmVz cG9uZHNUb1NlbGVjdG9yOiBAc2VsZWN0b3IoY29udmVydFJlY3RUb1NjcmVlbjopXSkKKyNlbmRp ZgorICAgIHJldHVybiBbW0ZSQU1FX05TX1ZJRVcgKGYpIHdpbmRvd10gYmFja2luZ1NjYWxlRmFj dG9yXTsKKyNpZiBNQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwNzAKKyAgZWxzZQor ICAgIHJldHVybiBbW0ZSQU1FX05TX1ZJRVcgKGYpIHdpbmRvd10gdXNlclNwYWNlU2NhbGVGYWN0 b3JdOworI2VuZGlmCiAjZWxzZQogICByZXR1cm4gW1tGUkFNRV9OU19WSUVXIChmKSB3aW5kb3dd IHVzZXJTcGFjZVNjYWxlRmFjdG9yXTsKICNlbmRpZgpAQCAtNjk0Miw3ICs2OTYxLDcgQEAgLSAo dm9pZClvdGhlck1vdXNlRHJhZ2dlZDogKE5TRXZlbnQgKillCiAgIFtzZWxmIG1vdXNlTW92ZWQ6 IGVdOwogfQogCi0jaWZkZWYgTlNfSU1QTF9DT0NPQQorI2lmIGRlZmluZWQgTlNfSU1QTF9DT0NP QSAmJiBNQUNfT1NfWF9WRVJTSU9OX01BWF9BTExPV0VEID49IDEwNzAKIC0gKHZvaWQpIG1hZ25p ZnlXaXRoRXZlbnQ6IChOU0V2ZW50ICopIGV2ZW50CiB7CiAgIE5TUG9pbnQgcHQgPSBbc2VsZiBj b252ZXJ0UG9pbnQ6IFtldmVudCBsb2NhdGlvbkluV2luZG93XSBmcm9tVmlldzogbmlsXTsKQEAg LTY5NTksMTEgKzY5NzgsMTggQEAgLSAodm9pZCkgbWFnbmlmeVdpdGhFdmVudDogKE5TRXZlbnQg KikgZXZlbnQKIAogICAgICAgaWYgKFtldmVudCBwaGFzZV0gPT0gTlNFdmVudFBoYXNlQmVnYW4p CiAJewotCSAgbGFzdF9zY2FsZSA9IDEuMCArIFtldmVudCBtYWduaWZpY2F0aW9uXTsKLQkgIGVt YWNzX2V2ZW50LT5hcmcgPSBsaXN0NCAobWFrZV9mbG9hdCAoMC4wKSwKLQkJCQkgICAgbWFrZV9m bG9hdCAoMC4wKSwKLQkJCQkgICAgbWFrZV9mbG9hdCAobGFzdF9zY2FsZSksCi0JCQkJICAgIG1h a2VfZmxvYXQgKDAuMCkpOworI2lmIE1BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTA3 MAorICAgaWYgKFtldmVudCByZXNwb25kc1RvU2VsZWN0b3I6IEBzZWxlY3RvcihtYWduaWZpY2F0 aW9uKV0pCisgICAgIHsKKyNlbmRpZgorICAgICAgIGxhc3Rfc2NhbGUgPSAxLjAgKyBbZXZlbnQg bWFnbmlmaWNhdGlvbl07CisgICAgICAgZW1hY3NfZXZlbnQtPmFyZyA9IGxpc3Q0IChtYWtlX2Zs b2F0ICgwLjApLAorICAgICBtYWtlX2Zsb2F0ICgwLjApLAorICAgICBtYWtlX2Zsb2F0IChsYXN0 X3NjYWxlKSwKKyAgICAgbWFrZV9mbG9hdCAoMC4wKSk7CisjaWYgTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPCAxMDcwCisgICAgIH0KKyNlbmRpZgogCX0KICAgICAgIGVsc2UKIAkvKiBS ZXBvcnQgYSB0aW55IGNoYW5nZSBzbyB0aGF0IExpc3AgY29kZSBkb2Vzbid0IHRoaW5rIHRoaXMK QEAgLTg0NTQsNyArODQ4MCw3IEBAIC0gKGluc3RhbmNldHlwZSkgaW5pdFdpdGhFbWFjc0ZyYW1l OihzdHJ1Y3QgZnJhbWUgKilmCiAgICAgICAvKiBtYWNPUyBTaWVycmEgYXV0b21hdGljYWxseSBl bmFibGVzIHRhYmJlZCB3aW5kb3dzLiAgV2UgY2FuJ3QKICAgICAgICAgIGFsbG93IHRoaXMgdG8g YmUgZW5hYmxlZCB1bnRpbCBpdCdzIGF2YWlsYWJsZSBvbiBhIEZyZWUgc3lzdGVtLgogICAgICAg ICAgQ3VycmVudGx5IGl0IG9ubHkgaGFwcGVucyBieSBhY2NpZGVudCBhbmQgaXMgYnVnZ3kgYW55 d2F5LiAgKi8KLSNpZmRlZiBOU19JTVBMX0NPQ09BCisjaWYgZGVmaW5lZCBOU19JTVBMX0NPQ09B ICYmIE1BQ19PU19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTAxMjAwCiAgICAgICBpZiAoW3Nl bGYgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRUYWJiaW5nTW9kZTopXSkKICAgICAg ICAgW3NlbGYgc2V0VGFiYmluZ01vZGU6TlNXaW5kb3dUYWJiaW5nTW9kZURpc2FsbG93ZWRdOwog I2VuZGlmCkBAIC04NTI0LDE0ICs4NTUwLDE2IEBAIC0gKHZvaWQpc2V0UGFyZW50Q2hpbGRSZWxh dGlvbnNoaXBzCiAgICAgIGJlaGF2aW9ycyBlYXJseSBvdGhlcndpc2UgY2hpbGQgd2luZG93cyBt YXkgbm90IGdvIGZ1bGxzY3JlZW4gYXMKICAgICAgZXhwZWN0ZWQgbGF0ZXIuICAqLwogCisjaWYg TUFDX09TX1hfVkVSU0lPTl9NQVhfQUxMT1dFRCA+PSAxMDEwMDAKICNpZiBNQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA8IDEwMTAwMAotICBpZiAoW2NoaWxkIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3Ioc2V0QWNjZXNzaWJpbGl0eVN1YnJvbGU6KV0pCisgIGlmIChbc2VsZiByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldEFjY2Vzc2liaWxpdHlTdWJyb2xlOildKQogI2Vu ZGlmCiAgICAgLyogU2V0IHRoZSBhY2Nlc3NpYmlsaXR5IHN1YnJvbGVzLiAgKi8KICAgICBpZiAo cGFyZW50RnJhbWUpCiAgICAgICBbc2VsZiBzZXRBY2Nlc3NpYmlsaXR5U3Vicm9sZTpOU0FjY2Vz c2liaWxpdHlGbG9hdGluZ1dpbmRvd1N1YnJvbGVdOwogICAgIGVsc2UKICAgICAgIFtzZWxmIHNl dEFjY2Vzc2liaWxpdHlTdWJyb2xlOk5TQWNjZXNzaWJpbGl0eVN0YW5kYXJkV2luZG93U3Vicm9s ZV07CisjZW5kaWYKIAogI2lmIE1BQ19PU19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTA3MAog ICBbb3VyVmlldyB1cGRhdGVDb2xsZWN0aW9uQmVoYXZpb3JdOwpAQCAtODU1Nyw3ICs4NTg1LDcg QEAgLSAodm9pZClzZXRQYXJlbnRDaGlsZFJlbGF0aW9uc2hpcHMKIAogI2lmZGVmIE5TX0lNUExf Q09DT0EKICNpZiBNQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwNzAKLSAgICAgIGlm IChbb3VyVmlldyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yICh0b2dnbGVGdWxsU2NyZWVu KV0KKyAgICAgIGlmIChbb3VyVmlldyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yICh0b2dn bGVGdWxsU2NyZWVuKV0pCiAjZW5kaWYKICAgICAgICAgICAvKiBJZiB3ZSBhcmUgdGhlIGRlc2Nl bmRlbnQgb2YgYSBmdWxsc2NyZWVuIHdpbmRvdyBhbmQgd2UKICAgICAgICAgICAgICBoYXZlIG5v IG5ldyBwYXJlbnQsIGdvIGZ1bGxzY3JlZW4uICAqLwpAQCAtODU4MiwxMSArODYxMCwxMSBAQCAt ICh2b2lkKXNldFBhcmVudENoaWxkUmVsYXRpb25zaGlwcwogCiAjaWZkZWYgTlNfSU1QTF9DT0NP QQogI2lmIE1BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTA3MAotICAgICAgaWYgKFtv dXJWaWV3IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IgKHRvZ2dsZUZ1bGxTY3JlZW4pXQor ICAgICAgaWYgKFtvdXJWaWV3IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IgKHRvZ2dsZUZ1 bGxTY3JlZW4pXSkKICNlbmRpZgotICAgICAgICAgIC8qIENoaWxkIGZyYW1lcyBtdXN0IG5vdCBi ZSBmdWxsc2NyZWVuLiAgKi8KLSAgICAgICAgICBpZiAoW291clZpZXcgZnNJc05hdGl2ZV0gJiYg W291clZpZXcgaXNGdWxsc2NyZWVuXSkKLSAgICAgICAgICAgIFtvdXJWaWV3IHRvZ2dsZUZ1bGxT Y3JlZW46c2VsZl07CisgLyogQ2hpbGQgZnJhbWVzIG11c3Qgbm90IGJlIGZ1bGxzY3JlZW4uICAq LworIGlmIChbb3VyVmlldyBmc0lzTmF0aXZlXSAmJiBbb3VyVmlldyBpc0Z1bGxzY3JlZW5dKQor ICAgW291clZpZXcgdG9nZ2xlRnVsbFNjcmVlbjpzZWxmXTsKICNlbmRpZgogCiAgICAgICBbcGFy ZW50V2luZG93IGFkZENoaWxkV2luZG93OnNlbGYK --Multipart_Wed_Apr_20_17:51:32_2022-1--