From:   Tom Saeger <tom.saeger@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Sasha Levin <sashal@kernel.org>,
        Naresh Kamboju <naresh.kamboju@linaro.org>,
        John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
        Rich Felker <dalias@libc.org>,
        Masahiro Yamada <masahiroy@kernel.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        Nathan Chancellor <nathan@kernel.org>,
        Dennis Gilmore <dennis@ausil.us>,
        Palmer Dabbelt <palmer@rivosinc.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Andrew Morton <akpm@linux-foundation.org>,
        Tom Saeger <tom.saeger@oracle.com>, stable@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
        linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
        Christoph Hellwig <hch@lst.de>,
        Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PATCH 5.10 v2 5/5] sh: define RUNTIME_DISCARD_EXIT
Date:   Fri, 10 Feb 2023 13:19:39 -0700
Message-Id: <20230210-tsaeger-upstream-linux-5-10-y-v2-5-ada7b8d36096@oracle.com>
In-Reply-To: <20230210-tsaeger-upstream-linux-5-10-y-v2-0-ada7b8d36096@oracle.com>
References: <20230210-tsaeger-upstream-linux-5-10-y-v2-0-ada7b8d36096@oracle.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ejhlRE5HK0oxdngzeDQwbzZwdDc0VWVIYklTb2U2eDlHaGRUUWw1OHF5L2dF?=
 =?utf-8?B?blk2TWxCanJyL3QwQUpDTkFyL2IrVGpUam9UcHdEV2NwejAzdFFlTGpEdjk1?=
 =?utf-8?B?R004T093Z0V6dVd5VkNMS1VzVlMyaFZuUkJ5Uys2ZkRzd21tcVk4aC93MHl3?=
 =?utf-8?B?T1gwYnRjNTRHb1VOTTJuL2hVTkFKOFExNG9GbWM3YjlNNkRtamxSR004c2tr?=
 =?utf-8?B?UlhTeExtYVF4dlE4ZXkwbDN0S0ppZ3hNdkFSV0ovV3FPUXpjc095ckJ2cEN5?=
 =?utf-8?B?Y0phT0pudTdYbnpESFU5YVFOV2VaWkduZ051aGxZL1J3V2JXd0tIRHhTMnJK?=
 =?utf-8?B?ZWZmMlEvSXJPSzA4QTJ3ZEdZemJ4SE5XOVZFU25ELy92YUpJcGlHUVVUb3Jq?=
 =?utf-8?B?dmE1djBWV0ZldTVKZmxUTHZ1WDVSUndCT0pxRmVFWE9KL1RyY1hOSXJCbERy?=
 =?utf-8?B?YXAzbnRaMmpJNWwvNlVuWS9na2k2NTZ1Z0ZlT2dFUnNhUTF4aWdYKzlzajFi?=
 =?utf-8?B?cnhRRWFDZkhRaVVnN0psODN1cUw4VVI4dng5YkFqeEJKVi90aFF4c1dWVHJI?=
 =?utf-8?B?bnFqcnlUMFBOOHlzNFh5Tm5rMW9sM3pNUVA3UVRiUkpmSTVWU1ZvL08ycG1T?=
 =?utf-8?B?clZHYlp5ZlJVNFAxK2ZaaW9taEpHcFFmWVU5R0hZZHk5Q3FnY1NPVThUaktk?=
 =?utf-8?B?bHlIYzI4dVhMNDBkU0VrS3FaRkdVbXg5Sm9XT0JqQm83RXpnY3NSSzNTZWcz?=
 =?utf-8?B?SkZUVzFzVTgraGx6RklqYS9VR09BQ1IrK1krQzFEKzdzZFRWVEkrWitCaWpI?=
 =?utf-8?B?UWROcFovTHlhTmxvN1VpeXRhVldNb3czdk40RTVoYTZoRmVmTi92bS93ZEVU?=
 =?utf-8?B?aGlybW1YNnZFVXp4TjQxL1QzM1d4b2x1blJEM2xvZlhiOXJldUFnMVloTGM0?=
 =?utf-8?B?YXRzWUdhdnlEeEVnT0JDeDBpSitVTEp3NjlOeWVXYXNDK09KVHNSVDQrcnZC?=
 =?utf-8?B?d28zL1hmWWN6OUE1cDZNdGExYUd3NUJzNlUrWVJOeHpZYU1XbXBkbnJJSjNz?=
 =?utf-8?B?bkx2QXk0NVJNUDR3SzBNcTZiSlp4T0hoR2lETzNzNnJ1djhvTms4S2p0NFVM?=
 =?utf-8?B?V05FclpsRERmNFlyeERTTHdDaEtUSVRzVENhNEFVYkVsQnVxWjZEdmhyQTFV?=
 =?utf-8?B?UjJNU295WTAxUXNEbDJBV0R0Q0pZL0RiWFYxR0VyZ24rNys5REhpSjYwbFR2?=
 =?utf-8?B?MFBsWFRvS3RabGlZdDk4ZmQ2bitIdGE4SVZZT2ZCaEFabDRudXJ5dEVQZjRy?=
 =?utf-8?B?bmxsZkhYT0hSY1l4NGhzSmxJQTJSZWFrUFFQeUJhZWVpcWNzWmFSR0xmZHFU?=
 =?utf-8?B?d3Y5aVNpd05MbTdDR04zc2lLV0FVL1hZVXU1aUg0YWRCUk9yZmpZL1Q5YkRu?=
 =?utf-8?B?UXRhZmVNVmI0STFTeXpBZHVIK0xPb0hSOHJwZ250by9Gbkh0bjNEOGZ5Y29P?=
 =?utf-8?B?SFhHcTNzWHduUnkwRjhqQ043bmk5TVYxTnhXV3JlMnRvSFZWUWxWTUtjS1Q0?=
 =?utf-8?B?dXk5VURBSW1kdExQVFpFbmNhWjJuNXFOSlNXODNZUkQ4STFud3pybHlLclMr?=
 =?utf-8?B?T2FEeWt0VDFwT293Q2ZYZjZnMFlrOU0vbE1wcGZVY2lpS042cEZQZXJMaDJn?=
 =?utf-8?B?OHpBK2tZWHRxemVkMk1WM1lLOUQ1TXNxRHBVdlAwTUtESE5zL2NtRjBiYVRr?=
 =?utf-8?B?dWtJRXlPcXhXQUhyNWo2bXpYdmRZalNtMjYxVzF3Q2RsRjFRNVJyTEdDMStR?=
 =?utf-8?B?UnVoU3JLUEdKNHFKWnZ6OUVMMHRMb25iRlVITndhNU9tQnVxanNrYW1aSUVX?=
 =?utf-8?B?WEdjckFaWTRWS0UxRnpDT3lqYmJydXorVFNUa2NGbDBEUDBUQzJZeVdtVkpK?=
 =?utf-8?B?SnJET0Fhd0gwRkFCQm15Tk9aVVVkQm51MUZuNjZObUVld3AzWlBIK3hYcmhq?=
 =?utf-8?B?c3pyZDRTRDRoNFcyMzhkYlRwektFQzhYSmloQUpnam4yK01CL2I5cklPdU1J?=
 =?utf-8?B?cWxjblhSVmZJdWYxa3FHZlpWakwzYVVGcEY2bHN0ZGJnV1VubjJBWkMrRGdM?=
 =?utf-8?B?c0VidEJORDBuS3QvaWZISDdtSTlFVk90eU9jclR5c0d3Ky9RWTlvYWVDZUpT?=
 =?utf-8?Q?QblZk/LEXZtocZKndS1B5k0=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?akxRbDU5MWVGNzlYTkNzbmtuaGtSbGRDeStFelJZa3lIR3NPbW9UUjErYVI1?=
 =?utf-8?B?WTZBd3dNck5rNVk4NXhFeFJwQlZvZEc1SVhicjhyOWVpQU5OK1l6Ym1WcEVr?=
 =?utf-8?B?dmh0Mi9CcFNVZjVFV2wreHhtbmxpWDVSbUZqYWRmN1lxTFVNRnBJMDJDUHlh?=
 =?utf-8?B?STh3VlAxNGM1blpYcGdPVjFPejE4MmI3SHRWUk82ZnVkL2ZiRTNtVGVFZVA5?=
 =?utf-8?B?ZUJIY0d3TUhFaWNXR21BcWpSQTdteXl6TmQ5eVpjSEVqQzI4UlFyUmFVbm5y?=
 =?utf-8?B?WjZaY2tHTjFJUEc4Tk9QMHJoVmFBd0pYc0p0ZWhNOHNkaHl6cDhLM21tMlA3?=
 =?utf-8?B?V2ZmTkVyYis0V2prM3o3eDV4TTVLbUlFVUk2UHkwVXVlRS9YTFZQT01pQzlL?=
 =?utf-8?B?bEdKTnhMb3RMT3VzOVdaZVU3SmRtOUFEMzF3QlFXUmZtTHd3YmdSZHZab2hz?=
 =?utf-8?B?TUIzQ3lMSE11ZVU5ZDZYcmhWeVZ4MUR5R2pvc3IwSWttTHhlV2k5by9rb0Vj?=
 =?utf-8?B?c3h1a0hpTVdqWG00bHh3WGRnUDJjQ2xuM2tlS1VSSnFHYUlrOEdUWmduTTk4?=
 =?utf-8?B?V1lNOHMxdkNReWdGTGU2YkQ4SnNOZWxuNFgxaU1ZbVBPaVN6MmRqWUIzT09Y?=
 =?utf-8?B?TWtvWFIrT2FIaElMY2VnZHgvRy9CZ0dMNlJpdWdQZzg0U250UjIzRXcraExN?=
 =?utf-8?B?dTUweFE3QUNSYWFlb2NuSTJOTFF5VEpqbFQrOUF3WFlXNFA4QmZGWFV3Ry9S?=
 =?utf-8?B?L0xnTU9aTzcxU0IyeW9DV2laeE55QzRtK3N0b2pjZVl0U0dmck1HR2VwY1Fu?=
 =?utf-8?B?R0RKZERsK3JFQUZTcjZtNUlCcnB3anJoSjd1NWs4djd6VXdEU3Zhc2N1WGRx?=
 =?utf-8?B?SzdNSEZzZ1hWTGJsRmxUV1dqN3NsQWRzRzBGWWtWOGdpZXJmcFNhSEl4eWh4?=
 =?utf-8?B?YkROZEJKdzZEWHk0Sk53L2VhYzJoQkxCZEdiTmFlVFZTRi9tNlYyWmJTcita?=
 =?utf-8?B?Sy84cEN4WUpKYis1YXo2VGpkbjFzcGw2MytVQlBhdG9JV00reTFKcS93dnZZ?=
 =?utf-8?B?dk1KWndxYzRQdms2TWJSVFZldGxGcDk4VUlBVEpVNmtaYzA1aVNxcnNVbHZm?=
 =?utf-8?B?RGpYdWJxY1VBYndMWllUakdZbXkzTUxQSGlOSmp6N1J0RDBXd1p3QkZVVTZS?=
 =?utf-8?B?bWN5cU81Uk9XSmdzZDdyWWs2M2dhSHBmcVptemhOVlF0alh3anMvdnJISThV?=
 =?utf-8?B?VVFadW1JK0ZqVUpKNS8wTWM5V1BaZldZOW1JSDF0OGljdkFHS1l0dDVnR2gv?=
 =?utf-8?B?U1FOT0w1a1FmN0JVSUtVbnJzYmR5MVdraUFCU1I5ZGViMlNyZ0VtdXdRbEQ2?=
 =?utf-8?B?QnFmLzUxVmNQQjc3bzFHN1NCOCtKSlEwQlgvRlduWVQ3Uk5DSlBJM1BPTzVF?=
 =?utf-8?B?L2JEQzJQYno3QTRzdy9reG1VbXVjQ0tkOEJPNitCQWZSd3hzem5jeGc4bDBP?=
 =?utf-8?B?OGo2dmhyc0gyYnJ6R3VYb3YycXh6LzZQWUlRTFZ0R1d0M0NVczBDYzhTUS9k?=
 =?utf-8?B?aDF0bTR6RzNCZ2ttU2NzanRtTzVYVHNQVmJlSFFJLzlPMTNPc003NnpINVox?=
 =?utf-8?B?NzNnd09tUlRkZ3JHNUs4dWJRY0Y5YjFob3JyTGllNmdMQmFxaGFUK2JrcEdk?=
 =?utf-8?Q?rp6TdAmmhuWdeqwT3x1o?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7574f9b1-dfb4-4c88-7b4f-08db0ba42eaa
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 20:19:59.1023
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iKgru7HBQOZIsiNE5AApNd5hYe8R65hIDQFNS5ZhLkeKijggRB/9eDsI+y1d1RYmOzgiGSwa14UCGO4GOHqmEg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5652
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22
 definitions=2023-02-10_15,2023-02-09_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 adultscore=0
 malwarescore=0 mlxscore=0 phishscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2302100173
X-Proofpoint-GUID: 6JB-zsa-1VpLB1o2s3OCHTAAmJGCNgM3
X-Proofpoint-ORIG-GUID: 6JB-zsa-1VpLB1o2s3OCHTAAmJGCNgM3
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

commit c1c551bebf928889e7a8fef7415b44f9a64975f4 upstream.

sh vmlinux fails to link with GNU ld < 2.40 (likely < 2.36) since
commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv").

This is similar to fixes for powerpc and s390:
commit 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT").
commit a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error
with GNU ld < 2.36").

  $ sh4-linux-gnu-ld --version | head -n1
  GNU ld (GNU Binutils for Debian) 2.35.2

  $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu- microdev_defconfig
  $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu-

  `.exit.text' referenced in section `__bug_table' of crypto/algboss.o:
  defined in discarded section `.exit.text' of crypto/algboss.o
  `.exit.text' referenced in section `__bug_table' of
  drivers/char/hw_random/core.o: defined in discarded section
  `.exit.text' of drivers/char/hw_random/core.o
  make[2]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1
  make[1]: *** [Makefile:1252: vmlinux] Error 2

arch/sh/kernel/vmlinux.lds.S keeps EXIT_TEXT:

	/*
	 * .exit.text is discarded at runtime, not link time, to deal with
	 * references from __bug_table
	 */
	.exit.text : AT(ADDR(.exit.text)) { EXIT_TEXT }

However, EXIT_TEXT is thrown away by
DISCARD(include/asm-generic/vmlinux.lds.h) because
sh does not define RUNTIME_DISCARD_EXIT.

GNU ld 2.40 does not have this issue and builds fine.
This corresponds with Masahiro's comments in a494398bde27:
"Nathan [Chancellor] also found that binutils
commit 21401fc7bf67 ("Duplicate output sections in scripts") cured this
issue, so we cannot reproduce it with binutils 2.36+, but it is better
to not rely on it."

Link: https://lkml.kernel.org/r/9166a8abdc0f979e50377e61780a4bba1dfa2f52.1674518464.git.tom.saeger@oracle.com
Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
Link: https://lore.kernel.org/all/Y7Jal56f6UBh1abE@dev-arch.thelio-3990X/
Link: https://lore.kernel.org/all/20230123194218.47ssfzhrpnv3xfez@oracle.com/
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dennis Gilmore <dennis@ausil.us>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
---
 arch/sh/kernel/vmlinux.lds.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 3161b9ccd2a5..b6276a3521d7 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -4,6 +4,7 @@
  * Written by Niibe Yutaka and Paul Mundt
  */
 OUTPUT_ARCH(sh)
+#define RUNTIME_DISCARD_EXIT
 #include <asm/thread_info.h>
 #include <asm/cache.h>
 #include <asm/vmlinux.lds.h>

-- 
2.39.1