From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by sourceware.org (Postfix) with ESMTPS id 633D13858C2A for ; Fri, 19 Jan 2024 20:08:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 633D13858C2A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 633D13858C2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::22f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705694883; cv=none; b=owpB4rQxWUNg5bNyn+KMKwjMkCgaOx/zUtB1ua3USYQwgqOLVNSuB7q1rbqNEmXDgSUg5riksfaCV5htdZYV1i6ihDSldmrUbTvSvvxG4KzA+GnEcg/3BihTu9j0t85DTWSYcBDap7uchkO30E6oXndhNAfUPHKEMWHylmKoiMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705694883; c=relaxed/simple; bh=syfyU33Nka069D1gG0rknlMU3/8PEYfdM7RWAniT3QQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=ZQLY9Zn/ubFWu5wR4jJYwdlgpMYVWEGwYvDwCRdYVJ2OkvebIfLSA0y1TlQWux4I+p4Ll2nZjVQiE+5IP67iYOXMKzvMJEWvv3yyO0UVTDWXeD8PkaSh05BTQmnug4s652JIujB2VX4osU0GwqAskIRbU8LnPVvatD+1Om1tq78= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2cceb5f0918so13190371fa.2 for ; Fri, 19 Jan 2024 12:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1705694878; x=1706299678; darn=gcc.gnu.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=C15ooJ3VNuyTpeiRCEoKXpgKFJYw17VR/LHv/lgCFWI=; b=b+ToojRGLpgATzwKxiSamHZOvmQnLjPlNzY0H4iN+EXP9NBoxkMgtVyB1rRT/TearC aqUmq02EsQ4cseZVrVJKXTeOjy5AVQ/dmAk5jSxOmcbiH9snyaoExWqVY87XHceaKrPt 1dVXzFjZmoqRVQUrSqcktlrYVcAPEqr1/H9b2AXod6EjEJ6gik2TksFZ/TXW0dAN0SPL ZZBzwbLzsIi54sfBSDdqsd6im1v6DOI7XXjHrqK1oGiFIxOtrhsS1C7XY1yYT9NmmgKR g1xnWr/8xMz8oGYsB928e5Vblotz3wXA+hbmr1pwUFwjqdNuAK1pw6kXptXdgHcyijpF roqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705694878; x=1706299678; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=C15ooJ3VNuyTpeiRCEoKXpgKFJYw17VR/LHv/lgCFWI=; b=KtXUXHWqybQG95lrjg1a124yoFqowxwEEyXOfHy77LoNyoQmds2CkD3fKf1Gp3Ew6E WHc3PpybIcfdxiijfV8YDyu7/ZL4jQoRSo7hQITMtJ/AMtsgZtRjZB69FKZp3N2sg2Fy YKDq0YCM06HV3IpYUN4O3twUWrvw2MLmaVKsDwLPTo40ru+p4qgIWgPHpxb2Il5JJFb2 hPfnBGibJYa2CevL82wfHRek3iLnLiEMHwcXbJmoLhq8aOwvt+9sxjl61qnw9q6E+u48 bvXH7lPjWTDkgysSiSJ4A50Z89wYCXbgxYKAwi+AJgOzQ+BAleoEekyFQ54stpey0il5 u06A== X-Gm-Message-State: AOJu0Yz6mtE9udcS8UYy8GkCN6+ZDbPXVQKWb3EKyJnN5iyVqQ34hgo2 W9kPB/uaUK0+TALXmn4WXt5g23f1E6QEvu5YgLhJV1hU4fsGUGNqjEnUV4GiZ857Df+CfFlTICr ttT1mgw== X-Google-Smtp-Source: AGHT+IHtoUI08D3i8pou4i8TknMr5XHmcev1If3YBYiu6sidVfAajk3CzHjhUqTdAuP+kmnvCJ8xiQ== X-Received: by 2002:a05:6512:130c:b0:50e:7cbf:8213 with SMTP id x12-20020a056512130c00b0050e7cbf8213mr67830lfu.127.1705694878350; Fri, 19 Jan 2024 12:07:58 -0800 (PST) Received: from ?IPV6:2001:16b8:3fec:9600:be03:58ff:fe31:f74? ([2001:16b8:3fec:9600:be03:58ff:fe31:f74]) by smtp.gmail.com with ESMTPSA id gz10-20020a170906f2ca00b00a2ed743ec47sm3535953ejb.121.2024.01.19.12.07.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Jan 2024 12:07:57 -0800 (PST) Content-Type: multipart/mixed; boundary="------------fYR9UN0nqW0bfou4Y57lSnuL" Message-ID: <3a1d7856-47fd-4e00-8b08-1e985cac6130@baylibre.com> Date: Fri, 19 Jan 2024 21:07:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches , Andrew Stubbs From: Tobias Burnus Subject: [patch][gcn] mkoffload: Fix linking with "-g"; fix file deletion; improve diagnostic [PR111966] X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------fYR9UN0nqW0bfou4Y57lSnuL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit This patch fixes PR111966, i.e. when compiling offloaded code with "-g" but without "-march=", mkoffload created a file with e_flags set to gfx803/fiji as architecture - while all other files used gfx900, which the linker did not like. Reason: When the default was changed, this flag was missed. When passing -march=... instead of relying on the default, it works. Additionally, it fixed a bug with dangling pointers and multiple deletion attempts for the same file, leading normally only to the accumulation of /tmp/cc*.mkoffload.dbg.o files. And, finally,  when building with a recent GCC; it warned about missing %<...%> or %qs quotes. I added a couple to reduce the number of warnings. OK for mainline? — I think the /tmp/cc*.mkoffload.dbg.o part of the patch could also be backported to GCC 13 (and 12) if deemed to be useful. Tobias --------------fYR9UN0nqW0bfou4Y57lSnuL Content-Type: text/x-patch; charset=UTF-8; name="mkoffload-gcn-fix.diff" Content-Disposition: attachment; filename="mkoffload-gcn-fix.diff" Content-Transfer-Encoding: base64 W2djbl0gbWtvZmZsb2FkOiBGaXggbGlua2luZyB3aXRoICItZyI7IGZpeCBmaWxlIGRlbGV0 aW9uOyBpbXByb3ZlIGRpYWdub3N0aWMgW1BSMTExOTY2XQoKV2l0aCBkZWJ1Z2dpbmcgZW5h YmxlZCwgJyoubWtvZmZsb2FkLmRiZy5vJyBmaWxlcyBhcmUgZ2VuZXJhdGVkLiBUaGUgZV9m bGFncwpoZWFkZXIgb2YgYWxsICoubyBmaWxlcyBtdXN0IGJlIHRoZSBzYW1lIC0gb3RoZXJ3 aXNlLCB0aGUgbGlua2VyIGNvbXBsYWlucy4KU2luY2UgcjE0LTQ3MzQtZzU2ZWQxMDU1YjJm NDBhYzE2MmFlOGQzODIyODBhYzA3YTMzZjc4OWYgdGhlIC1tYXJjaD0gZGVmYXVsdAppcyBu b3cgZ2Z4OTAwLiBJZiBjb21waWxpbmcgd2l0aG91dCBhbnkgLW1hcmNoPSBmbGFnLCB0aGUg ZGVmYXVsdCB2YWx1ZSBpcwp1c2VkIGJ5IHRoZSBjb21waWxlciBidXQgbm90IHBhc3NlZCB0 byBta29mZmxvYWQuIEhlbmNlLCBta29mZmxvYWQuY2MncyB1c2VzCml0cyBvd24gZGVmYXVs dCBmb3IgbWFyY2ggLSB1bmZvcnR1bmF0ZWx5LCBpdCBzdGlsbCBoYWQgZ2Z4ODAzL2Zpamkg YXMgZGVmYXVsdCwKbGVhZGluZyB0byB0aGUgbGlua2VyIGVycm9yOiAnaW5jb21wYXRpYmxl IG1hY2gnLiBTb2x1dGlvbjogVXBkYXRlIHRoZQpkZWZhdWx0IHRvIGdmeDkwMC4KCldoaWxl IGRlYnVnZ2luZyBpdCwgSSBzYXcgdGhhdCAvdG1wL2NjKi5ta29mZmxvYWQuZGJnLm8ga2Vw dCBhY2N1bXVsYXRpbmc7CnRoZXJlIHdlcmUgYSBjb3VwbGUgb2YgaXNzdWVzIHdpdGggdGhl IGhhbmRsaW5nOgoqIGRiZ29iaiB3YXMgYWx3YXlzIGFkZGVkIHRvIGZpbGVzX3RvX2NsZWFu dXAKKiBJZiBjb3B5X2Vhcmx5X2RlYnVnX2luZm8gcmV0dXJuZWQgdHJ1ZSwgZGJnb2JqIHdh cyBhZGRlZCBhZ2FpbgogIC0+IHBvaW50bGVzcyBhbmQgaW4gdGhlb3J5IGEgcmFjZSBpZiB0 aGUgc2FtZSBmaWxlIHdhcyBhZGRlZCBpbiB0aGUKICAgICBmYWN0aW9uIG9mIGEgc2Vjb25k LgoqIElmIGNvcHlfZWFybHlfZGVidWdfaW5mbyByZXR1cm5lZCBmYWxzZSwKICAtIEluIGV4 YWN0bHkgb25lIGNhc2UsIGl0IGFscmVhZHkgZGVsZXRlZCB0aGUgZmlsZSBpdCBzZWxmCiAg ICAoc2FtZSBwb3RlbnRpYWwgcmFjZSBhcyBhYm92ZSkKICAtIFRoZSBwb2ludGVyIGRiZ29i aiB3YXMgZnJlZWQgLSBzdWNoIHRoYXQgZmlsZXNfdG9fY2xlYW51cCBjb250YWluZWQKICAg IGEgZGFuZ2xpbmcgcG9pbnRlciAtIHByb2JhYmx5IHRoZSByZWFzb24gdGhhdCBzdGFsZSBm aWxlcyByZW1haW5lZC4KU29sdXRpb246IE9ubHkgaWYgY29weV9lYXJseV9kZWJ1Z19pbmZv IHJldHVybnMgdHJ1ZSwgZGJnb2JqIGlzIGFkZGVkIHRvCmZpbGVzX3RvX2NsZWFudXAuIElm IGl0IHJldHVybnMgZmFsc2UsIHRoZSBmaWxlIGlzIHVubGlua2VkIGJlZm9yZSBmcmVlaW5n CnRoZSBwb2ludGVyLgoKV2hlbiBjb21waWxpbmcsIEdDQyB3YXJuZWQgYWJvdXQgc2V2ZXJh bCBmYXRhbF9lcnJvciBtZXNzYWdlcyBhcyBoYXZpbmcKbm8gJTwuLi4lPiBvciAlcXMgcXVv dGVzLiBUaGlzIHBhdGNoIG5vdyBzaWxlbmNlcyBzZXZlcmFsIG9mIHRob3NlIHdhcm5pbmdz CmJ5IHVzaW5nIHRob3NlIHF1b3Rlcy4KCmdjYy9DaGFuZ2VMb2c6CgoJUFIgb3RoZXIvMTEx OTY2CgkqIGNvbmZpZy9nY24vbWtvZmZsb2FkLmNjIChlbGZfYXJjaCk6IENoYW5nZSBkZWZh dWx0IHRvIGdmeDkwMAoJdG8gbWF0Y2ggdGhlIGNvbXBpbGVyIGRlZmF1bHQuCgkoc2ltcGxl X29iamVjdF9jb3B5X2x0b19kZWJ1Z19zZWN0aW9ucyk6IE5ldmVyIHVubGluayB0aGUgb3V0 ZmlsZQoJb24gZXJyb3IgYXMgdGhlIGNhbGxlciBkb2VzIHNvLgoJKG1heWJlX3VubGluaywg Y29tcGlsZV9uYXRpdmUpOiBVc2UgJTwuLi4lPiBhbmQgJXFzIGluIGZhdGFsX2Vycm9yLgoJ KG1haW4pOiBMaWtld2lzZS4gRml4ICdta29mZmxvYWQuZGJnLm8nIGNsZWFudXAuIAoKU2ln bmVkLW9mZi1ieTogVG9iaWFzIEJ1cm51cyA8dGJ1cm51c0BiYXlsaWJyZS5jb20+CgogZ2Nj L2NvbmZpZy9nY24vbWtvZmZsb2FkLmNjIHwgMzIgKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9nY2MvY29uZmlnL2djbi9ta29mZmxvYWQuY2MgYi9nY2Mv Y29uZmlnL2djbi9ta29mZmxvYWQuY2MKaW5kZXggZDRjZDUwOTA4OWUuLjBkMGU3YmFjOWIy IDEwMDY0NAotLS0gYS9nY2MvY29uZmlnL2djbi9ta29mZmxvYWQuY2MKKysrIGIvZ2NjL2Nv bmZpZy9nY24vbWtvZmZsb2FkLmNjCkBAIC0xMjQsNyArMTI0LDcgQEAgc3RhdGljIGNvbnN0 IGNoYXIgKmdjbl9kdW1wYmFzZTsKIHN0YXRpYyBzdHJ1Y3Qgb2JzdGFjayBmaWxlc190b19j bGVhbnVwOwogCiBlbnVtIG9mZmxvYWRfYWJpIG9mZmxvYWRfYWJpID0gT0ZGTE9BRF9BQklf VU5TRVQ7Ci11aW50MzJfdCBlbGZfYXJjaCA9IEVGX0FNREdQVV9NQUNIX0FNREdDTl9HRlg4 MDM7ICAvLyBEZWZhdWx0IEdQVSBhcmNoaXRlY3R1cmUuCit1aW50MzJfdCBlbGZfYXJjaCA9 IEVGX0FNREdQVV9NQUNIX0FNREdDTl9HRlg5MDA7ICAvLyBEZWZhdWx0IEdQVSBhcmNoaXRl Y3R1cmUuCiB1aW50MzJfdCBlbGZfZmxhZ3MgPSBFRl9BTURHUFVfRkVBVFVSRV9TUkFNRUND X0FOWV9WNDsKIAogc3RhdGljIGludCBnY25fc3RhY2tfc2l6ZSA9IDA7ICAvKiBaZXJvIG1l YW5zIHVzZSBkZWZhdWx0LiAgKi8KQEAgLTE1NCw3ICsxNTQsNyBAQCBtYXliZV91bmxpbmsg KGNvbnN0IGNoYXIgKmZpbGUpCiAgIGlmICghc2F2ZV90ZW1wcykKICAgICB7CiAgICAgICBp ZiAodW5saW5rX2lmX29yZGluYXJ5IChmaWxlKSAmJiBlcnJubyAhPSBFTk9FTlQpCi0JZmF0 YWxfZXJyb3IgKGlucHV0X2xvY2F0aW9uLCAiZGVsZXRpbmcgZmlsZSAlczogJW0iLCBmaWxl KTsKKwlmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24sICJkZWxldGluZyBmaWxlICVxczog JW0iLCBmaWxlKTsKICAgICB9CiAgIGVsc2UgaWYgKHZlcmJvc2UpCiAgICAgZnByaW50ZiAo c3RkZXJyLCAiW0xlYXZpbmcgJXNdXG4iLCBmaWxlKTsKQEAgLTMyMCwxMCArMzIwLDcgQEAg Y29weV9lYXJseV9kZWJ1Z19pbmZvIChjb25zdCBjaGFyICppbmZpbGUsIGNvbnN0IGNoYXIg Km91dGZpbGUpCiAKICAgZXJybXNnID0gc2ltcGxlX29iamVjdF9jb3B5X2x0b19kZWJ1Z19z ZWN0aW9ucyAoaW5vYmosIG91dGZpbGUsICZlcnIsIHRydWUpOwogICBpZiAoZXJybXNnKQot ICAgIHsKLSAgICAgIHVubGlua19pZl9vcmRpbmFyeSAob3V0ZmlsZSk7Ci0gICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgfQorICAgIHJldHVybiBmYWxzZTsKIAogICBzaW1wbGVfb2JqZWN0 X3JlbGVhc2VfcmVhZCAoaW5vYmopOwogICBjbG9zZSAoaW5mZCk7CkBAIC04MDQsNyArODAx LDcgQEAgY29tcGlsZV9uYXRpdmUgKGNvbnN0IGNoYXIgKmluZmlsZSwgY29uc3QgY2hhciAq b3V0ZmlsZSwgY29uc3QgY2hhciAqY29tcGlsZXIsCiAgIGNvbnN0IGNoYXIgKmNvbGxlY3Rf Z2NjX29wdGlvbnMgPSBnZXRlbnYgKCJDT0xMRUNUX0dDQ19PUFRJT05TIik7CiAgIGlmICgh Y29sbGVjdF9nY2Nfb3B0aW9ucykKICAgICBmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24s Ci0JCSAiZW52aXJvbm1lbnQgdmFyaWFibGUgQ09MTEVDVF9HQ0NfT1BUSU9OUyBtdXN0IGJl IHNldCIpOworCQkgImVudmlyb25tZW50IHZhcmlhYmxlICU8Q09MTEVDVF9HQ0NfT1BUSU9O UyU+IG11c3QgYmUgc2V0Iik7CiAKICAgc3RydWN0IG9ic3RhY2sgYXJndl9vYnN0YWNrOwog ICBvYnN0YWNrX2luaXQgKCZhcmd2X29ic3RhY2spOwpAQCAtODU5LDExICs4NTYsMTEgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgIG9ic3RhY2tfaW5pdCAoJmZpbGVz X3RvX2NsZWFudXApOwogICBpZiAoYXRleGl0IChta29mZmxvYWRfY2xlYW51cCkgIT0gMCkK LSAgICBmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24sICJhdGV4aXQgZmFpbGVkIik7Cisg ICAgZmF0YWxfZXJyb3IgKGlucHV0X2xvY2F0aW9uLCAiJTxhdGV4aXQlPiBmYWlsZWQiKTsK IAogICBjaGFyICpjb2xsZWN0X2djYyA9IGdldGVudiAoIkNPTExFQ1RfR0NDIik7CiAgIGlm IChjb2xsZWN0X2djYyA9PSBOVUxMKQotICAgIGZhdGFsX2Vycm9yIChpbnB1dF9sb2NhdGlv biwgIkNPTExFQ1RfR0NDIG11c3QgYmUgc2V0LiIpOworICAgIGZhdGFsX2Vycm9yIChpbnB1 dF9sb2NhdGlvbiwgIiU8Q09MTEVDVF9HQ0MlPiBtdXN0IGJlIHNldCIpOwogICBjb25zdCBj aGFyICpnY2NfcGF0aCA9IGRpcm5hbWUgKEFTVFJEVVAgKGNvbGxlY3RfZ2NjKSk7CiAgIGNv bnN0IGNoYXIgKmdjY19leGVjID0gYmFzZW5hbWUgKEFTVFJEVVAgKGNvbGxlY3RfZ2NjKSk7 CiAKQEAgLTkwOSw3ICs5MDYsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAK ICAgaWYgKCFmb3VuZCkKICAgICBmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24sCi0JCSAi b2ZmbG9hZCBjb21waWxlciAlcyBub3QgZm91bmQiLCBHQ0NfSU5TVEFMTF9OQU1FKTsKKwkJ ICJvZmZsb2FkIGNvbXBpbGVyICVxcyBub3QgZm91bmQiLCBHQ0NfSU5TVEFMTF9OQU1FKTsK IAogICAvKiBXZSBtYXkgYmUgY2FsbGVkIHdpdGggYWxsIHRoZSBhcmd1bWVudHMgc3RvcmVk IGluIHNvbWUgZmlsZSBhbmQKICAgICAgcGFzc2VkIHdpdGggQGZpbGUuICBFeHBhbmQgdGhl bSBpbnRvIGFyZ3YgYmVmb3JlIHByb2Nlc3NpbmcuICAqLwpAQCAtOTMxLDcgKzkyOCw3IEBA IG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkgICAgb2ZmbG9hZF9hYmkgPSBPRkZM T0FEX0FCSV9JTFAzMjsKIAkgIGVsc2UKIAkgICAgZmF0YWxfZXJyb3IgKGlucHV0X2xvY2F0 aW9uLAotCQkJICJ1bnJlY29nbml6YWJsZSBhcmd1bWVudCBvZiBvcHRpb24gIiBTVFIpOwor CQkJICJ1bnJlY29nbml6YWJsZSBhcmd1bWVudCBvZiBvcHRpb24gJTwiIFNUUiAiJT4iKTsK IAl9CiAjdW5kZWYgU1RSCiAgICAgICBlbHNlIGlmIChzdHJjbXAgKGFyZ3ZbaV0sICItZm9w ZW5tcCIpID09IDApCkBAIC05OTQsNyArOTkxLDggQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogICAgIH0KIAogICBpZiAoIShmb3BlbmFjYyBeIGZvcGVubXApKQotICAgIGZh dGFsX2Vycm9yIChpbnB1dF9sb2NhdGlvbiwgImVpdGhlciAtZm9wZW5hY2Mgb3IgLWZvcGVu bXAgbXVzdCBiZSBzZXQiKTsKKyAgICBmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24sCisJ CSAiZWl0aGVyICU8LWZvcGVuYWNjJT4gb3IgJTwtZm9wZW5tcCU+IG11c3QgYmUgc2V0Iik7 CiAKICAgY29uc3QgY2hhciAqYWJpOwogICBzd2l0Y2ggKG9mZmxvYWRfYWJpKQpAQCAtMTA2 Niw3ICsxMDY0LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgIGNmaWxl ID0gZm9wZW4gKGdjbl9jZmlsZV9uYW1lLCAidyIpOwogICBpZiAoIWNmaWxlKQotICAgIGZh dGFsX2Vycm9yIChpbnB1dF9sb2NhdGlvbiwgImNhbm5vdCBvcGVuICclcyciLCBnY25fY2Zp bGVfbmFtZSk7CisgICAgZmF0YWxfZXJyb3IgKGlucHV0X2xvY2F0aW9uLCAiY2Fubm90IG9w ZW4gJXFzIiwgZ2NuX2NmaWxlX25hbWUpOwogCiAgIC8qIEN1cnJlbnRseSwgd2Ugb25seSBz dXBwb3J0IG9mZmxvYWRpbmcgaW4gNjQtYml0IGNvbmZpZ3VyYXRpb25zLiAgKi8KICAgaWYg KG9mZmxvYWRfYWJpID09IE9GRkxPQURfQUJJX0xQNjQpCkBAIC0xMTMwLDcgKzExMjgsNiBA QCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJCSAgICB9CiAJCSAgZWxzZQogCQkg ICAgZGJnb2JqID0gbWFrZV90ZW1wX2ZpbGUgKCIubWtvZmZsb2FkLmRiZy5vIik7Ci0JCSAg b2JzdGFja19wdHJfZ3JvdyAoJmZpbGVzX3RvX2NsZWFudXAsIGRiZ29iaik7CiAKIAkJICAv KiBJZiB0aGUgY29weSBmYWlscyB0aGVuIGp1c3QgaWdub3JlIGl0LiAgKi8KIAkJICBpZiAo Y29weV9lYXJseV9kZWJ1Z19pbmZvIChhcmd2W2l4XSwgZGJnb2JqKSkKQEAgLTExMzksNyAr MTEzNiwxMCBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJCSAgICAgIG9ic3Rh Y2tfcHRyX2dyb3cgKCZmaWxlc190b19jbGVhbnVwLCBkYmdvYmopOwogCQkgICAgfQogCQkg IGVsc2UKLQkJICAgIGZyZWUgKGRiZ29iaik7CisJCSAgICB7CisJCSAgICAgIG1heWJlX3Vu bGluayAoZGJnb2JqKTsKKwkJICAgICAgZnJlZSAoZGJnb2JqKTsKKwkJICAgIH0KIAkJfQog CSAgICB9CiAJfQpAQCAtMTIxNCw3ICsxMjE0LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogCiAgICAgICBvdXQgPSBmb3BlbiAoZ2NuX3MyX25hbWUsICJ3Iik7CiAgICAg ICBpZiAoIW91dCkKLQlmYXRhbF9lcnJvciAoaW5wdXRfbG9jYXRpb24sICJjYW5ub3Qgb3Bl biAnJXMnIiwgZ2NuX3MyX25hbWUpOworCWZhdGFsX2Vycm9yIChpbnB1dF9sb2NhdGlvbiwg ImNhbm5vdCBvcGVuICVxcyIsIGdjbl9zMl9uYW1lKTsKIAogICAgICAgcHJvY2Vzc19hc20g KGluLCBvdXQsIGNmaWxlKTsKIAo= --------------fYR9UN0nqW0bfou4Y57lSnuL--