Received-SPF: pass (google.com: domain of linux-kernel+bounces-215330-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
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 v4 1/3] kbuild: add mod(name,file)_flags to assembler flags for module objects
Date: Fri, 14 Jun 2024 13:14:26 -0400
Message-ID: <20240614171428.968174-2-kris.van.hees@oracle.com>
In-Reply-To: <20240614171428.968174-1-kris.van.hees@oracle.com>
References: <20240614171428.968174-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?Zk0x1s7kHtmwRHaiQypLGkGSqGDpIu//qr8Cqqhkgvd7DTPcv3UAmxZiKgRY?=
 =?us-ascii?Q?OpfrtQXLH0/i0cHVmdfnFJsCYtozWlqTPMu5ELgZ2VdrHMK+v/SviDsA/duY?=
 =?us-ascii?Q?DiehJKD3pbAraRYiYtVDTBmYxdAFTJ/JdSWxRl4BVMSx3N31nUyND1UzBIeu?=
 =?us-ascii?Q?QEGMtaAuZJmKZTKhEpsy44H/Y5MimdXWIhR8g3lKa7o4AMrqg5znDaVj/UZi?=
 =?us-ascii?Q?IFKZJlzprYi+mMcy9Fe0S/2goVVI/k11+TOkc9ccJ9xGLbqSABz+zji9G66W?=
 =?us-ascii?Q?4OPyy8iGBnkOZB/sNjtxDK/QuYqBLGchs6fJe7Nau/D2m9o21rL/tSOlu3Eq?=
 =?us-ascii?Q?gkUEFBx03setD9xJN1j0hMCrG78qHmgsdVqfAux5kBC4RXfV4QblJ3S89DX6?=
 =?us-ascii?Q?lIvjQXZ02ZQIN2T+eS8H6BmJm8zAP5eHks+1OPKT6pV0PJGq0hASo1Fj1HEF?=
 =?us-ascii?Q?7rvmCML1q1/RfmoU94bZ8eZoBcA+7dF1yvlGQKGPorFmYAZ3P1BQT1YHJGbJ?=
 =?us-ascii?Q?uMKVvpiPS/cRX94m2azqqjuUafbi+aDoMpR19698GVa2h1MJ7EaROmmjfvAS?=
 =?us-ascii?Q?QyrvtzdPXRmFMYmgVtAk/lCNv/eNIeSHGC8e82s3wZYHTuJzQRkI4enNitf3?=
 =?us-ascii?Q?Vp1mW6INYoPor7aXu5hGaP564Pcpnn/q5F1uNB+QFM5UeqUka2zdgw96Q6y6?=
 =?us-ascii?Q?U1FKD2B6rbOPukQEVoH12BWVLHoHulEZAWgDw7mZ8a0i/eZdHyrRKXB/vFK9?=
 =?us-ascii?Q?tq6IMtyFMglr5tbVzu6UxEwxHizjGovAnDbZMKscvNcXALW5C6uowEz6IQYG?=
 =?us-ascii?Q?3Js9U6CY7P+dRox3HTub5/bYPKEAMr9rG0NqaMO/eoJ2tezJ00cas6bSmM2u?=
 =?us-ascii?Q?mOYvPlbXD1BW0NBWQ6gd+g8aacb7pp2Bww+JToF83lFF8hpSDljRDis93YbY?=
 =?us-ascii?Q?t054ZpqDJ7nEb60zdaDXpMvs1Ccpuay250rLWMT13XHpSIdDpkdFQK6vassQ?=
 =?us-ascii?Q?crA847F870OHgKiWAMe5zpKHb1WG3YOdGtuWYh3Zt2wveqTLm4V9pX42Kq8P?=
 =?us-ascii?Q?MI3DxDTWwzTwOAGDWwc9QSHHfjEAI8dBnFch81HlEyNYq9MmEvJJe+FfSdIL?=
 =?us-ascii?Q?L0CBRFqzxZ/kQgQK4jN0V4op6w75Rc/Jmy4lkfpNpPhPXiaQ2YNT/3tN9QO/?=
 =?us-ascii?Q?0XHOa6N6Z3hnJxgyyjoXJ7i29hFBWQTkkMhYUOcs+EBOeMfyLKd/inaTzFyI?=
 =?us-ascii?Q?cy+1dVlnWHU75SSUnha0g5z3KoaV6ulnmkayUUKKQu8w0d3rM8tEl2S61eO8?=
 =?us-ascii?Q?3nhrTcy+RsJeCzJjkcyt2ycitGONiioVmsSdCX3aDM7KnE02u2qaphUmTdkb?=
 =?us-ascii?Q?zTs5njPyH460gBMkxIMiUABlD5Y3xvAziRi0wlqpquQOQdkOj3mw8zUS788r?=
 =?us-ascii?Q?XMK5O3FAzfz43M3gaRNt0lAUmpOoSHnFQOxNjgmlp35ak5IcqjfKbzpQDnUO?=
 =?us-ascii?Q?Q/f0QP5tMNMuHxEKDzlDCv5WP1/2fG95/yQ3EspfqjPmEFvEetqGBg/oJ2iG?=
 =?us-ascii?Q?V6YtygQX2nBt2U/tkhtvFXU9LN75/Hu6fY4mhWL6YnzRbwH1jqouI0+83oWm?=
 =?us-ascii?Q?kA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	1RaO8RsgnC187vrgFj9K2+m38nqwb5P/WP1gb/M28JMjpiLmfYn/eVY4eA30DpuaeQoinhlROoujtwQd+hqYcZlN9nlfQTP+/lXJBzUmF1FPwUXOh1mG8iDrM7VQD3Xxgu3JVQQLs252Fj87Qk42W274LicXo4ZQAkvq7LedrmEmDKKmVpfs07lWPaTsJh7/DtyCi44DraSRtYfCnRUugbVgJY15Zia+1OJHun6W6+QkScHfFm/Ou+yyqJl9r5vDTVP/I2Rz9egCcfJ57AUUKFl+piMu1OzeIHb9oGyiH483mcIuOEE5QM+QpsECpDwpokhGS/OMAZ6nunLsEPdjtEXlqq65yUQXdYNU2hP/FPJP2X+vCK6rB3RuMX3FsDfGpX8wB58Nw9m4p3TTJHQ/m4tTGS2N+UdzgA6u3O2stt9xG37tUzTpyBWOS0xsY56r/LeniGNB95ugrAROiAVMMmiZXTqLfqUJ80hhEbUjgKY19LUOHgmyJJW9/pAPSWL0O9p92+r/STKxKVK1UoIdf1VTmEZJK0J/gn6RWwg/sPy9Dz3VQOWzmlqdBQ8tnSfNewvofCsMj9FwxbcRZRnzZVW06zW8EFtoDVQ0ohV2eUk=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fdd8017a-f7f8-428a-ff09-08dc8c95a246
X-MS-Exchange-CrossTenant-AuthSource: SN7PR10MB6287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 17:15:48.1172
 (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: pfT/+l3mRre/FeoCiGFD0nvxpDW5XiLRsrxJGbaIlgq5jlqp3gVbVHLFmyxW0PE+yQ7CB9Z81h1LmtO8+HYSiu+N1CzgoNjOSyK/C4GTNGk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR10MB7847
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-14_15,2024-06-14_03,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 adultscore=0
 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=805 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406140118
X-Proofpoint-GUID: ztja67lz8PJYxdMRto5ozWDpnBDwy7D-
X-Proofpoint-ORIG-GUID: ztja67lz8PJYxdMRto5ozWDpnBDwy7D-

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 3179747cbd2c..a2524ffd046f 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.45.1