From nobody Wed Jan 11 01:21:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ns8yp0L9Mz2r2Rg; Wed, 11 Jan 2023 01:21:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ns8yn6qR5z3ph8; Wed, 11 Jan 2023 01:21:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673400082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0NEG0XnEPB2F/jKOr/cO8zU4wjqfgfCX97K2UsylL7M=; b=jzowc3raYqHccwKVhWl77qIffV1ZWoBCZ4KKy356YixO5szMMjaSlzkT6wW29WNRG596N+ UFNqCdJNJylC9Nfu7LU27zZwdbE/z/tgxRhG1ffsMDLY9lfNyFxcLiwpfK9sRqEVFHOu6r KotC7O3sqWqIoG1PdFHSNwsSj8WuoYF9J0Rm2GZ6tDTeNVT+sXW71IZCS63Z0VF6r6qMU0 AcXS0YLSzIe07mrBc0QOcuNl4+tLcaxNkdu9eTjUYc7TB6gb/yG6VXgE0SlIYgdVNuo4s/ DhJAftnDW0ihdGqaAKbQzD7X1QyIGXptL4Zn3HQ/zazpcvjD8PKmgMt+MeX2Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673400082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0NEG0XnEPB2F/jKOr/cO8zU4wjqfgfCX97K2UsylL7M=; b=r/lgUMV0C9kojZf+NrqzX2sz1nFiBEUbsFuzi+nAWaWshp+WhzA/M8VNQ5CuB8XeX3lNBj fqRap3PWoef65XPLppynB/G3RGTB6UflFMy3hjFO54xxLc+rwztY5m34f7Tol2RfFWhnpz wtIwIBhKGxhCBUnunEZWAbgoDsV/O6Eo9fTwjhb3oXWW8TpNzBK0P8r7gNGEJiXEQe6aZI O1LxChXThGQrhlvTxJre3C5I69jlHIJ0gVPsCsHKHhFhFH+xaoUIGd+fXzdE41jrdcSVK+ unwN16XkfqNZDEr+XzljufN8VB3e4gLrRtF7fOMRhL5cVifAkKpN1bfQKD8F3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673400082; a=rsa-sha256; cv=none; b=EZvk+7uKaPfD//spurevHBRaWjAj+QgPTIRiczjt6xtL1b+Tzo9ZrseLNKQIuFwi314WLq uuiMv+cT9VDa5En9eiwuBuiMzSgVpe93fRNXPxDXU26+KyG/qTaEgGQCcXI3Ez6mw5bdsw 8+o53MVPVQLsC+w8Hz4narnLjm2L4rgsnGxYFe8vguR0J3bVWwnBLDAOzOacX84AYhh5ge DftWlx1znBPlKpnAAqsAlCkkmQNjLD2EPnOCbQBP2xTI+bGBH9szysUEFN/SyHKBM5CAAX lGzMcSwl9tJILKOI0tMDJiJ0qdhv7I6CnFpu2dYTD+ZTcrM7wjLA0yy6Uv69YA== Received: from [IPV6:2601:c2:1:3527:cd6d:9115:6a61:482d] (unknown [IPv6:2601:c2:1:3527:cd6d:9115:6a61:482d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Ns8yn4BxCz1CFF; Wed, 11 Jan 2023 01:21:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <12b7ec5a-abf7-3b28-da80-ffedc1244c47@FreeBSD.org> Date: Tue, 10 Jan 2023 20:21:20 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: git: b069d3e01931 - main - rtld: Revert "When loading dso without PT_GNU_STACK phdr, only call" Content-Language: en-US To: Jessica Clarke , Cy Schubert Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202301042255.304MtY3G002415@gitrepo.freebsd.org> <20230105035046.A01DE62E@slippy.cwsent.com> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 1/4/23 7:59 PM, Jessica Clarke wrote: > On 5 Jan 2023, at 03:50, Cy Schubert wrote: >> >> In message <202301042255.304MtY3G002415@gitrepo.freebsd.org>, John Baldwin >> writ >> es: >>> The branch main has been updated by jhb: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=b069d3e0193121ff6de348f68c7ce93e >>> e61e5e2f >>> >>> commit b069d3e0193121ff6de348f68c7ce93ee61e5e2f >>> Author: John Baldwin >>> AuthorDate: 2023-01-04 22:55:00 +0000 >>> Commit: John Baldwin >>> CommitDate: 2023-01-04 22:55:00 +0000 >>> >>> rtld: Revert "When loading dso without PT_GNU_STACK phdr, only call" >>> >>> After the removal of ia64 and sparc64, all current architectures >>> support executable stacks at an architectural level. >>> >>> This reverts commit 1290d38ac50b3afa7e5781d9d97346a1042c736c. >> >> I tried git log as follows in two independent repos, my "prod" repo and the >> working repo I commit from: >> >> slippy$ git log 1290d38ac50b3afa7e5781d9d97346a1042c736c >> fatal: bad object 1290d38ac50b3afa7e5781d9d97346a1042c736c >> slippy$ >> >> Could there be some corruption somewhere? Do other people have the same >> result as I do when they run git log against that hash? Or are my repos >> corrupted? >> >> When I run git log and search for the string "When loading dso without >> PT_GNU_STACK phdr, only call", I find the following, suggesting that the >> svn2git process may have resulted in different hashes in different repos >> used by different people. >> >> commit cb38d4941c45e3c72c4b5b3fad87d297d950cf53 >> Author: Konstantin Belousov >> AuthorDate: Tue Jan 25 21:12:31 2011 +0000 >> Commit: Konstantin Belousov >> CommitDate: Tue Jan 25 21:12:31 2011 +0000 >> >> When loading dso without PT_GNU_STACK phdr, only call >> __pthread_map_stacks_exec() on architectures that allow executable >> stacks. >> >> Reported and tested by: marcel (ia64) >> >> Notes: >> svn path=/head/; revision=217851 >> >> BTW, our GH read-only mirror has the same hash as above suggesting that >> jhb's repo may not be in sync with others with regard to svn2git generated >> commits? >> >> Or, does this point to a deeper problem with inconsistent repos or some >> other svn2git inconsistency somewhere? > > It’s the hash from the old GitHub mirror that's now freebsd/freebsd-legacy. Interesting, that is the hash I got from git blame for some reason. I might have done the blame in CheriBSD though which has a complicated history where it merged commits from the old hashes up to a point when the new hashes were published, then CheriBSD has a special merge commit to join the old and new histories before merging the new hashes from that point forwards. -- John Baldwin