From:   Tom Saeger <tom.saeger@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     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>,
        Jisheng Zhang <jszhang@kernel.org>,
        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-sh@vger.kernel.org
Subject: [PATCH 6.1 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT
Date:   Fri, 27 Jan 2023 21:10:22 -0700
Message-Id: <ffaafd3083a1738007a3043b698ec5ac6d8d83d6.1674876902.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674876902.git.tom.saeger@oracle.com>
References: <cover.1674876902.git.tom.saeger@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LScoh7VaUbMhQdP6wscZfHLlqb3k3ejV8LZ2LQL0J34yj9kjtVLlcf0JJfeF?=
 =?us-ascii?Q?OCMAIP2YedDfuKGhJAJImiWshHNYAfX/zkFxLoMsXzkwebeglDv+Kj99OSpw?=
 =?us-ascii?Q?mEdVzpzzOLBkhXeH/ptodwedvOqZaCmIKly3PF3vfrEeLgGQuDww44MenaT2?=
 =?us-ascii?Q?IUzdA49/6ce4pL+OciXmVkFVkfrpqWH09kKe+5+DAxfxvmOJe8jNUkh8RtI+?=
 =?us-ascii?Q?8zOd2Pu/w5uCmGHQTjFqnLMfp4Ex9/s8KjpeKhQCLIW7fhcdSOcZRsHJ8uTK?=
 =?us-ascii?Q?8dqOPGbcs4RS5q3v8pUEbQtw1xco5Lqomz/X4wTQB/CiWHUAtd5c+geywaY2?=
 =?us-ascii?Q?0MerWXXpegrHp3A6yIPStSGfOVxZDQn+QzAUzhLxAGHIjask5tBlwjonLVmf?=
 =?us-ascii?Q?y81sOA0fy7e8nJ+DU/TTHaIJIv+hwXF8WtMYgSJuN6JOjSrlWBrKjWjnxNZP?=
 =?us-ascii?Q?wu5E1tDwYFHkTucP+wFVFph3FvIRjCTAaSgnJ5sXeaGXvB/CxbFvjKSJYPpu?=
 =?us-ascii?Q?8iH1rWvucwsA4M6jnqv1T8580iFL9EqRx23mB0kSPd03BZ/0baXalbHR0PXn?=
 =?us-ascii?Q?HXQvFJ/oMc4/8ljv0r+kXhHk/GPeJhaLClFlMpFVK8Fq2NlrH3J4M09wnCR/?=
 =?us-ascii?Q?jUSfegSbdRbvNi0DtwE3HXgdFUyE0vrD+kz7cFFSxCWFtbdk/VqPUBDrqljY?=
 =?us-ascii?Q?t+h+wQoyfJnwAoHT2BNq1pRJ8TErdXhla6y/7E3/fY+0P34RoFAmFTJwzlvA?=
 =?us-ascii?Q?JPVSVIUHuwXpgijsBb6L7mSMwiTnItUVz00HJWs0xOW7YV7W7EIrO6zIckpI?=
 =?us-ascii?Q?LvUTgUjpEKCcUE1HsJ5iyOKiczTwXInO9J/d3KyLDEQjem9SuaIto3ZznuiB?=
 =?us-ascii?Q?t5uIeEqT4W2skpaxdLc6ibXfgJ1QRBDYp5xHoqn8ddUYNgl0FE2gtvJlxZMd?=
 =?us-ascii?Q?HGMmgym2IQbCj0f7qXDbXQ5GMszKeJrFil0gJUiIZqpqsfhoUqjenTNA1CgH?=
 =?us-ascii?Q?x3z3kDRpBqPs4CJQ3b8qkghizvntR7idxyMlUcdLwZ6O/8+KhYj7MpJXw4xd?=
 =?us-ascii?Q?R3f/m5+dycKMM2S85f4JH1kH67WYJXTP9zJmwl7AaxXRo4c/5uEtTEzRXOnZ?=
 =?us-ascii?Q?gGsfbdJWtKeok/2N6n3pu81qoheXVQI3Zk8nVOQX4zs6ufgHygQo9Egu5l5K?=
 =?us-ascii?Q?I2GQKPBISMyEPbpB3kpgL88Iz+n/BJ7xcad9+vP0vTaTpLeq+HMdZ/q9KEsN?=
 =?us-ascii?Q?zUvptFNpw3n5pnBBuYmHTXCdCoXIDuD9OvT2e0/KPw7lJcT/0xdzD2uFGL/2?=
 =?us-ascii?Q?hhtqT81U7oATm2KzocOf8eL/AW9+qIf49IpOt0Lyn/MkXTWT+tP6FhOF4BCy?=
 =?us-ascii?Q?KqZhI5gUiMOD2uN4w0aTVRUHO/oApHHENHaHMiYpTt39gx2ZCSuepkl3ijbv?=
 =?us-ascii?Q?tzJYvxUMhP9aoHS4SoMljW8vol4r9/tPgpHCf1gs+IM+skjKubjhFa6MoZzs?=
 =?us-ascii?Q?0BJtxPlGJWzZypbrV5+P01msJGY+n5MLqsmZm6kZZeo/K1BpApK22YAWDaeG?=
 =?us-ascii?Q?9qQXpEM4k+/HYqOSPUzlq1+YUp/XFIvzie5e+0lhIGnpnwkZGsSBIzUuPKVx?=
 =?us-ascii?Q?0LRLSYBHvuAzIm5dcmAVc0M=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?1xsMPWja1iK6unUB/WP254kHvkJaZUcmIgT5vB92nf7MhG78w5O6bH/nhzMH?=
 =?us-ascii?Q?fM1gnKdoicspHHmSTNEr8krvLqRvIU7S7us4x6dly5xyyVq9KAsPgolNO96N?=
 =?us-ascii?Q?4EVchQPcSeYyYd65m+aYOLW8i8fbvepsos8KlpMq3EFPnGfg3+lm/akLmdTp?=
 =?us-ascii?Q?Ex9/n88LCqztHCDqoEBFcw61Q8qWmTw1O7XX77OB8Um/9vM92ixCzLzcmP5L?=
 =?us-ascii?Q?gT/CzJNfzkyEwBCswqv+scIMPmSlr7KP0usp2hxd2E3saG2VeqNhDXSt6rxC?=
 =?us-ascii?Q?hTCid/Iforp3oG0mlRsOcOxDQI0cuXCGMplbhfDj0v3SOr9+qD27PHDFW+X4?=
 =?us-ascii?Q?yola2VzlDKhJgoOimWQAcqcadAOHDPn7lPHVGlO5F3n8wkk083MSVDZVY2hE?=
 =?us-ascii?Q?8ODFGPK59hB2/BaRO2Bt13gw0KYmfBtFAcH23azPltwqNiBIbz4M13WfC29+?=
 =?us-ascii?Q?8DmUXBE9MmNwl2GXurdx+NfycU6JyghLUW/CDORGkFH6T+aX7ir8AQw1IsG0?=
 =?us-ascii?Q?P7Q7mhi8XarM6VMo1FjimLR9SqKTml5Xyv78TvxcdMFx3gDIuSpNlMQGMrmS?=
 =?us-ascii?Q?tW3Uo/EyYP6g3iPtfWVBiLKVPNiT2wekV+JaajibwmaMPS6sUtELUcMgXfkZ?=
 =?us-ascii?Q?n0jQUJ1P/AJwYrZ+Cge2/0N5SPqXGE16yaMvohvuxUOPR7SYOcOb89BT/tjr?=
 =?us-ascii?Q?+D10T5AZXZUNGPjRLtZCQiCSl80QrmZeFFkK23UBGBR4Aj1BvAX2flpYupIf?=
 =?us-ascii?Q?eVSJvDpF1XELvZ9AuUfU8+wmDebUJrFtJI8CUamCGcFbgOtMuJRfZ25LVMQK?=
 =?us-ascii?Q?nq7219AnpcRQ1Ifj8yGXkE9wnfZxW5AV5CU5HjxOtebKswEIaardQtWaToh/?=
 =?us-ascii?Q?iweP1WvL1rZlk51ZcA7pX9+Oez/wniBmX51CGrEKerW1SyxkEBEFxrhiivZe?=
 =?us-ascii?Q?5mtooiyFK51JUIsI6dJSbZeoEuXvsX+B9KynaqvDfosO26Rz6IHWtW4GBR06?=
 =?us-ascii?Q?SFtZmRsI/7wt4QTSxZKBZpo7PKDZg/wG4I+gktepVyl9/BfnXMj1diRxIeUY?=
 =?us-ascii?Q?rPMZw3f3VcE2KX8n3imPE2Ahehz8XA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4ff290-17e4-468c-6661-08db00e5a063
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:44.3155
 (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: Nzo7yqXNVK6Y8INm8o9U48gfQ6bQFQcaK43TMFNa6Q2yZ8dB5162zzqQEuUTor+KT/N0ykpTBmkh4SIEPXXhBA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-28_01,2023-01-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301280039
X-Proofpoint-GUID: HQwOE0q3YeA2I65LaR6pD4HXMpuzmgnI
X-Proofpoint-ORIG-GUID: HQwOE0q3YeA2I65LaR6pD4HXMpuzmgnI
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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."

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>
---
 arch/sh/kernel/vmlinux.lds.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 3161b9ccd2a5..791c06b9a54a 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -4,6 +4,8 @@
  * 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