Received-SPF: pass (google.com: domain of linux-kernel+bounces-181731-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Kris Van Hees <kris.van.hees@oracle.com>
To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
        linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Cc: Kris Van Hees <kris.van.hees@oracle.com>,
        Masahiro Yamada <masahiroy@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Jiri Olsa <olsajiri@gmail.com>,
        Elena Zannoni <elena.zannoni@oracle.com>
Subject: [PATCH v3 1/6] kbuild: add mod(name,file)_flags to assembler flags for module objects
Date: Fri, 17 May 2024 00:28:34 -0400
Message-ID: <20240517042839.544650-2-kris.van.hees@oracle.com>
In-Reply-To: <20240517042839.544650-1-kris.van.hees@oracle.com>
References: <20240517042839.544650-1-kris.van.hees@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?GjUUMQ9TUDaDRXLLjNV3Pu0zJguGJt9p47NHE84E/QgZF/mwRl1b5PFW2GFX?=
 =?us-ascii?Q?E6OQl9Ism+5dHgGPO2HWLP7xzCVU3NuibujqamvtDH930m2kEhgfdE3xyQbM?=
 =?us-ascii?Q?3CjDjHODzFnEgTuaE6Ybrj5BTg9KEA0gRi2TpJYUlZ0sth+SQEASm0LUfvxf?=
 =?us-ascii?Q?gT3Mj9F0BhSbaKv17fx7pLvXP3o1+HD5zXu57J+tWp5ras0abpWBGMbRwnrb?=
 =?us-ascii?Q?PjhFtZR1kxEB9UwLK9YL0sYr55G1gin4iiVaHfKzx9yjNBla10U1oNTr40ky?=
 =?us-ascii?Q?UKz2y7uKyQenoqccAB7iHFF1wmTIixvWtQ8NGXGzU1+xQPiJigWcSdx/eyMI?=
 =?us-ascii?Q?WCHuLwHkDFYsKANYdiRZYjyfTUjLkF5yHe72y5Mqnbmyt1Hi0GCykIkMbZnX?=
 =?us-ascii?Q?ymb7hwlg09owsTZ0H3YEeR8qyBq2xyb9/AXRGUmt0WSQ2CCe4ukhMEET1D7B?=
 =?us-ascii?Q?v6HHwk/1UsGGb4+uUQELqjdlQH3oKm1dwVzVo5I0G4dNIn8c3CCfSsDBClyz?=
 =?us-ascii?Q?tSY72aMG2hrmXQfQYtdKVNzdZ8xeCbBCVdtDj/ZXe/mqzgvORPQ6xPpX5ciC?=
 =?us-ascii?Q?3xpE9/7/nXG+j0GKshD/aMkJqtoUp1d3Hkpdb8gminBgWxidcr+ZfRyaLP33?=
 =?us-ascii?Q?tPMdVnbgTWbPGCgQrVN7qiHX0qvkUhYgCSPTVZYQTnV17f8Iy1S5q9nJJzVz?=
 =?us-ascii?Q?Sid0J/p8i7sgPscdZXW+A0amVy0iKEFM/QxsKb0XqLVjfYdBIUS0tZID1p+4?=
 =?us-ascii?Q?NuJTkRVTz5m4UhqTV+3sTbwz1O7h6vs6A9rJJ8tYuQGLA8CxO/haNg4nO9u6?=
 =?us-ascii?Q?A85VeqZtNM+TZFUxwTeGdZIhpMonMIrFb/U92OTtGSJWD1FwXr9Ue3GdQIwg?=
 =?us-ascii?Q?hMsPpUvGaWrWBoJ/ziHUpu2rmRoorxd/9QzJ+Tbh7Mq6sI6cAHaFfkALaI/a?=
 =?us-ascii?Q?tpNbGkjarGhWUUG+aNjqzXUjr1t17uqmERTVgEISHIL0Xb7UaJQxL4VoO3f0?=
 =?us-ascii?Q?/pgTa5i9VJVmvydjhkPkcjf4k5dS6ey2mpfNytMjzUIoeRygj14vrSCkd7wG?=
 =?us-ascii?Q?/v+1dv8s7HWRKtFGirPiqugNRqH3ZrGsjZQJTXI0LuPK/LVoXr9Oiti++HSd?=
 =?us-ascii?Q?zFGHlGekXjC+jhChHghgUdzlaaxmIuEPi/6VkbPVBoIHmvrqjoeWoCfyZL90?=
 =?us-ascii?Q?/OsfbveLOvp69uPWOXxkmiN0UDdlKb/w3mKsWyK+Jnrbfn9JcP+9ghCkaarS?=
 =?us-ascii?Q?gAkDBJ08BZtahP9+kCgZ5xH9DjNU7cVeCbRCaLvvlpwGtMSWVNU9ydjv7oPC?=
 =?us-ascii?Q?IEDlW1ORBugQN07pPoksCAv8klxjUMHmo8oSRq7r9ekKw1XrAm3EYFonW8Nt?=
 =?us-ascii?Q?IHnnCTVywS5mD+HrXBiHPPG3nQIJO7DtS/6AgltPXTVlaIUMFgL/tVaEEkYY?=
 =?us-ascii?Q?ynWIc92nETAOpUhtH2+S4UbL65vuDTpbTzyu+8M+G6fT2f88P/TCx7io8yoG?=
 =?us-ascii?Q?FnBtLEBv0g5VySBRGq25BVpIUSO82qBn0gFSMrT9IlLIKnvSAqOfkzHGB2k+?=
 =?us-ascii?Q?7RvB0d0fdYx1gJtSh287ODYSIP/QnYp9Qa0mhLLHr7IvbaAqYnztm5QyMfVz?=
 =?us-ascii?Q?0Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	nK12u6uYwsCqL4dRovFkcH6V5SvO2kBqfQKoUGyHGzVEdUlwyA2a5x2JVsEA7UMt5v7WvxEqw0YG2T2dicIOh8eqdpRzF2nWbkl5UBmjbjXG2OD3cLafagSZMij1B0JUTd9H+P3VIneY7sQzMUFK+GrPBQM3KV1kOj06DzX5MY2KcYUHUo7XHUL26psv/0kunTIusw0fUpbDdTWIQnR9wrLMmE9t2T03gYquijjmYW/Ka2vrlko/V+5t1vreOmsPVlLWA0uhsxlOuYq9z90+yGhwJkN8peFWUW4qZWTp+6SH5j2sD/10fsnm0VmYCGzNPL4f0aIB5XXbdyaixr7DatEi1t69JE+eBzOy96z1FZZVgwpcWyjj9WqmkFdDqtoTsYjJTlPFLuCkg+DTVdDSkimF5JsUkKFAC+qw6lJ27bEvI5hsZ6nvcQV8XH/pkvQ83pfC1h2lv30oBZsr99A8GchgkAVsu8RSihUF5vglbYcPsTpJ7JOP7Xyfb1eWFxsAYse6rcfLzGexuZly0EMklN7x+OrfefiA0nJGWF5Fc1+SaYeDv4nue4QranHIzk5ccr2QmBzr+KKKjAAs4lLbdP88TxRKm8RxhClkZd2d6UM=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cd543ebc-361a-4edc-c278-08dc7629fce9
X-MS-Exchange-CrossTenant-AuthSource: SN7PR10MB6287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 04:29:48.9358
 (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: kviaSzCD+UdhEauziaHY8bc75Su2WO+Jyr9Z6U3+ZEiVxrbTMTOnEBcD+2fVPbTys8ukb9DNK8PxfBja6LAe1BxYNaZKIhfaZ6vNZ3HHVlI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7746
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-16_07,2024-05-15_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0
 mlxlogscore=808 spamscore=0 suspectscore=0 mlxscore=0 malwarescore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2405170034
X-Proofpoint-GUID: uldlBBVoi5tK_xyHURXYXVKUsbNLhixy
X-Proofpoint-ORIG-GUID: uldlBBVoi5tK_xyHURXYXVKUsbNLhixy

Module objects compiled from C source can be identified by the presence
of -DKBUILD_MODFILE and -DKBUILD_MODNAME on their compile command lines.
However, module objects from assembler source do not have this defines.

Add $(modfile_flags) to modkern_aflags (similar to modkern_cflahs), and
add $(modname_flags) to a_flags (similar to c_flags).

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---
 scripts/Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 3179747cbd2cc..a2524ffd046f4 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -234,7 +234,7 @@ modkern_rustflags =                                              \
 
 modkern_aflags = $(if $(part-of-module),				\
 			$(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE),	\
-			$(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL))
+			$(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) $(modfile_flags))
 
 c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 		 -include $(srctree)/include/linux/compiler_types.h       \
@@ -244,7 +244,7 @@ c_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 rust_flags     = $(_rust_flags) $(modkern_rustflags) @$(objtree)/include/generated/rustc_cfg
 
 a_flags        = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
-		 $(_a_flags) $(modkern_aflags)
+		 $(_a_flags) $(modkern_aflags) $(modname_flags)
 
 cpp_flags      = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 		 $(_cpp_flags)
-- 
2.43.0