From:   Tom Saeger <tom.saeger@oracle.com>
To:     Naresh Kamboju <naresh.kamboju@linaro.org>
Cc:     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>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Tom Saeger <tom.saeger@oracle.com>, stable@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org
Subject: [PATCH 5.4 fix build id for arm64 6/6] sh: define RUNTIME_DISCARD_EXIT
Date:   Tue, 24 Jan 2023 14:14:23 -0700
Message-Id: <7301d95edaf5bd0926bc93a67cb0cc1256549c95.1674588616.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674588616.git.tom.saeger@oracle.com>
References: <cover.1674588616.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?i2+MnUq9CX0L434diA3Szq3FqIydOuBIYFIUx8wr81ub799kQy8pl57e0M1H?=
 =?us-ascii?Q?OAku/VHFqCg/rvKFTtgzStT+py+uoLsizPf8F4JmrR04YJQF6zb90yjNkN1b?=
 =?us-ascii?Q?Am+cnsK4RjzLfDDXXLKbJI8pEUzOe4Rxh2s71Xn/1iut8SNFbecIswWDYY8v?=
 =?us-ascii?Q?mPhJjpwXwShnZecZPntJsu01Mb1HWvrmNtBzDJlF01q3sq3LMwEnu2MX5MNr?=
 =?us-ascii?Q?TS34zppv4BLbaJ8XlXeP0gqEQdMXWbnTHdVyhUg5uOzbz1NFTayTwl/NpmWt?=
 =?us-ascii?Q?mwXme4HnL5KNVubwY00Gd1M7XGCnRdO70ucBdTzRGp+NmyGPBMRAWTCvzdcz?=
 =?us-ascii?Q?KIAzYZlJXiFoIThMWLzASYWEuhX9aIeMESeiCSXmSuAgvCUQQTDz92fCh9cP?=
 =?us-ascii?Q?17omrXsCcANkir39E0Gwh5Hu4DWyAsFQjYZBgAfFbCsG5PBFDm+Ty5FCDwNV?=
 =?us-ascii?Q?zD1z3LV0kbieUAPjGeCkWbTiFHO/OeGkTVlZ2atBfNZXdDwOVhI+4XewrucT?=
 =?us-ascii?Q?s5/kvelJTM+P2fwj2SjY4ngeOJeDdoW236h0Of/xZ6j2QXMgAjVGx/mxVBt+?=
 =?us-ascii?Q?3r/JTlRaxdmq8oynAGi3xt1HE446XdHSf9oqX5XX+Sun5scUVggihMonrn0W?=
 =?us-ascii?Q?PIOYNtzzzqrLO/Hj6kdwSUb2T6v3hxEMsVvUiIV0Y1lS4Rwy2kpFEfFQTJeX?=
 =?us-ascii?Q?JQMJazb/oN05vwapyD7gNgPUHmedEo+dYoSyzt0sKXq0cXNDMjHlQI29Zvsp?=
 =?us-ascii?Q?y2OItR4RuTV/n5yCHlH1/TXzw5kFPdYS3vSxCTvcHGiO3qtoi1EoGqJWqabX?=
 =?us-ascii?Q?Et6+jZClG97M3rmDU3u2VbokMUx3dQg6YY1cV04n+0rgedzi5vP7PaALMVQd?=
 =?us-ascii?Q?xoaffohMUibGD2JBYsukrphP/pQJfeWftWtY5wWO94O10PT0P2eYXEphrCX2?=
 =?us-ascii?Q?Pg96dJnzZVTbGuvVgXJGtQGLwQ3RX28+N0yJr9pySXz2yjDCsx9IEICDCXRw?=
 =?us-ascii?Q?X6SnXcjAggwAsUJFNfNNiTP0u9TuAnF+rhLqUu2yDDWXTHFJQG66FFdthMuo?=
 =?us-ascii?Q?Lt/cMbUPEjDX5B9qEozYavpm0/L3A8UJaQ9m39I01A/PEkFaRivAkAk/cEAg?=
 =?us-ascii?Q?2aSZniiunw0DnzDO5MroglPMvQGnAzqbW6YKPPsOj9qHmfSOyndqLHm+Y2tl?=
 =?us-ascii?Q?qgDSokayHyomehpBb6GDeq3+nCokaYIhrWfv7UVAXFDJT0COxb5KiKbZC8w1?=
 =?us-ascii?Q?8G6jFWOz/AHW635csS87YSeVLW/B7xBxGKpY1RtH5egyo4AueZuKlxZQ0ThL?=
 =?us-ascii?Q?cSYQFtgPo8zV4CmDB4c/fr1FoZCYk5LUhggOhSkIeIUCwu+SV9cgUrkzn/KG?=
 =?us-ascii?Q?ZqpQntvSYp1huLRCY+iKv1eZ6d3DwxcCOC+bG2rpSVoknSl3RhxcocnF4coD?=
 =?us-ascii?Q?RFJvtc6QsxFTLnLXAMW9bD3NwaDMeS+Zy0Z2rSvbBgQi9tHuNC+XSt2/2NkT?=
 =?us-ascii?Q?cfKYxGZQ1BIb5OTTGZjNXUPO2O21b3oMDKVrHvI4dD//lAHncg6P8/QO0i9O?=
 =?us-ascii?Q?gzSJO4sIysZ+bAPvUFGv+PQeGTAAMztHPdANn+EtfRMfIdB2ZXw3u3LKSV5Y?=
 =?us-ascii?Q?2tZNJNBC2FdLBYQNdmvOyrM=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?s4F1jMSSS2/hYokZ82kKICQG50cghHPkaRTn7lRcQkHHwAkqAYLOkaS0r9uQ?=
 =?us-ascii?Q?hUB/4gmcIOl2WEmai26J2G2r0eatQTvFSUNfDHTL2XKNshrSFXXad5VPAbWJ?=
 =?us-ascii?Q?wrf2QzOmkNHY46hSHvOo2tkcgCCgu3YhsB8D7subxuYBLvfXzlX2Mwk7qhES?=
 =?us-ascii?Q?KvLD+aqHKo6kr3lLkdkuvZE2vCNAERvR5TNx7v4FuwgI3HJQE4sT461nMuC4?=
 =?us-ascii?Q?0rFvYLD+KSGw4H0bAL4vlkxbg82KHLnxoxMY1sBacJrCugsHh6wCRUu4d6IU?=
 =?us-ascii?Q?LVvlvui+16ibCoF1vC7FSjIe6CUBYD1HepwHkXKvuu5LXTaKlENSwU8yspEz?=
 =?us-ascii?Q?wKmDqj1x76rsnZ13RKOBTgrw+Zu24OypNNiMeywfQnuRh5t2BKMXrFn9I50H?=
 =?us-ascii?Q?zw/+dDcGkOQmkACb4Ovawr85J5YbEKB/cPziWdrPd3yfhatNASIhVjxkif4S?=
 =?us-ascii?Q?TrEtShzCaRfjvwFaoOg31GvobSOk57qh4b0P1aPD1EdS8Jd54XJ8Fi/PKWKu?=
 =?us-ascii?Q?GpnQsk68f6h5UMeqOUtmjA/zQKl4uPp6BR1ae/BcNlPVaOPvmzGhW+HhxVlx?=
 =?us-ascii?Q?6a2T+AoAbCdBEx9bBiQaYIWu/UdNc2jBGxz0Capf2nDDtBSlUC83dgo2UVCd?=
 =?us-ascii?Q?lxDzxuCg0Fff1jGVd595fRJnNThEmFwDNBDulCEgxezbaX1MpCCdAsHBp46A?=
 =?us-ascii?Q?ALGvfvxzkwz9HdILgeVgRqENefk6lXIHjq3bB0lOpi1ukhyYOjNE5flHq7FG?=
 =?us-ascii?Q?On1drJEgTsoYwc/gRuKpd/ePENxfQcNJNxkJhwOp8majzqVv0dZ5IS4cIesK?=
 =?us-ascii?Q?/MaGNgDv4j+RAl0km4Dj5rwyUSRdd/HRVy/yL131QgefJSTgRDXe0eJ0wCmy?=
 =?us-ascii?Q?RxKj+gNW3tRMDEjsDNnndSFPbRmbP+wFzYZqvTlbzkWN/6j3tmvNfjD6/Jsa?=
 =?us-ascii?Q?AKRlERS7GtO7pB309BrS1/GXKfs3ZlGAhesXyCv42oe4RWvxFUyDAVxyuJ23?=
 =?us-ascii?Q?YNz+EcapEcnobhQ1dlaj1z9TdQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2120322a-3f64-44c7-50c1-08dafe5007bf
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:50.8882
 (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: HEpIE6dVZdaX76C8ffLlAsxAU9W+T98CcpYFAW2LbPfq4udVO/rSm3bXzXypr7J3X3ohxKqIaJUIApHsmkdWGQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836
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-24_15,2023-01-24_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0
 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301240196
X-Proofpoint-GUID: WSRik6ZVs73JlTRWXfbpFdqI4Ou5GcNK
X-Proofpoint-ORIG-GUID: WSRik6ZVs73JlTRWXfbpFdqI4Ou5GcNK
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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 77a59d8c6b4d..ec3bae172b20 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -10,6 +10,7 @@ OUTPUT_ARCH(sh:sh5)
 #define LOAD_OFFSET	0
 OUTPUT_ARCH(sh)
 #endif
+#define RUNTIME_DISCARD_EXIT
 
 #include <asm/thread_info.h>
 #include <asm/cache.h>
-- 
2.39.1