Skip to contentSkip to conversation

tools: ynl: improve the direct-include header guard logic

PATCH Applied Jakub Kicinski 2 participants 2 messages Jun 21, 2023 – Jun 23, 2023

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH v2 1/1 tools: ynl: improve the direct-include header guard logic

Przemek suggests that I shouldn't accuse GCC of witchcraft, there is a simpler explanation for why we need manual define.

scripts/headers_install.sh modifies the guard, removing _UAPI. That's why including a kernel header from the tree and from /usr leads to duplicate definitions.

This also solves the mystery of why I needed to include the header conditionally. I had the wrong guards for most cases but ethtool.

---
v2:
- drop the HASH variable, too
v1: https://lore.kernel.org/all/[email protected]/

---
 tools/net/ynl/Makefile.deps | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
tools/net/ynl/Makefile.deps +6 -14
index 524fc4bb586b..f842bc66b967 100644
@@ -9,20 +9,12 @@
 
 UAPI_PATH:=../../../../include/uapi/
 
-# If the header does not exist at all in the system path - let the
-# compiler fall back to the kernel header via -Idirafter.
-# GCC seems to ignore header guard if the header is different, so we need
-# to specify the -D$(hdr_guard).
-# And we need to define HASH indirectly because GNU Make 4.2 wants it escaped
-# and Gnu Make 4.4 wants it without escaping.
+# scripts/headers_install.sh strips "_UAPI" from header guards so we
+# need the explicit -D matching what's in /usr, to avoid multiple definitions.
 
-HASH := \#
+get_hdr_inc=-D$(1) -include $(UAPI_PATH)/linux/$(2)
 
-get_hdr_inc=$(if $(shell echo "$(HASH)include <linux/$(2)>" | \
-			 cpp >>/dev/null 2>/dev/null && echo yes),\
-		-D$(1) -include $(UAPI_PATH)/linux/$(2))
-
-CFLAGS_devlink:=$(call get_hdr_inc,_UAPI_LINUX_DEVLINK_H_,devlink.h)
+CFLAGS_devlink:=$(call get_hdr_inc,_LINUX_DEVLINK_H_,devlink.h)
 CFLAGS_ethtool:=$(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_H_,ethtool_netlink.h)
-CFLAGS_handshake:=$(call get_hdr_inc,_UAPI_LINUX_HANDSHAKE_H,handshake.h)
-CFLAGS_netdev:=$(call get_hdr_inc,_UAPI_LINUX_NETDEV_H,netdev.h)
+CFLAGS_handshake:=$(call get_hdr_inc,_LINUX_HANDSHAKE_H,handshake.h)
+CFLAGS_netdev:=$(call get_hdr_inc,_LINUX_NETDEV_H,netdev.h)
Signature · 1 line
2.40.1
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Wed, 21 Jun 2023 16:17:19 -0700 you wrote:

Przemek suggests that I shouldn't accuse GCC of witchcraft, there is a simpler explanation for why we need manual define.

scripts/headers_install.sh modifies the guard, removing _UAPI. That's why including a kernel header from the tree and from /usr leads to duplicate definitions.

[...]

Here is the summary with links:
- [net-next,v2] tools: ynl: improve the direct-include header guard logic

    https://git.kernel.org/netdev/net-next/c/0c3d6fd4b89c

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html