[v3] drm/xe: xe_gen_wa_oob: replace program_invocation_short_name

Commit Message

Daniel Gomez via B4 Relay Sept. 25, 2024, 10:49 a.m. UTC

From: Daniel Gomez <[e-mail]>

program_invocation_short_name() may not be available in other systems.
Instead, replace it with the argv[0] to pass the executable name and
make it portable.

Fixes build error when program_invocation_short_name is not available:

drivers/gpu/drm/xe/xe_gen_wa_oob.c:34:3: error: use of
undeclared identifier 'program_invocation_short_name'    34 |
program_invocation_short_name);       |                 ^ 1 error
generated.

Suggested-by: Masahiro Yamada <[e-mail]>
Tested-by: Jeff Xie <[e-mail]>
Signed-off-by: Daniel Gomez <[e-mail]>
---
This patch allows for building the Linux kernel for arm64 in macOS with
LLVM.

macOS does not provide certain headers that are available in a GNU/Linux
distribution with development headers installed, usually provided by
the GNU C Library (glibc) and/or other projects. These missing headers
are needed as build dependencies. To address this, users need to provide
these headers manually.

To assist with provisioning and setting up the environment, the Bee
Headers Project [1][2][3] provides the necessary headers, along with a
pkg-config file to locate the include directory and an initialization
script to configure the environment. However, this is optional and users
can choose to set up their own environments and manually provide the
required headers. In that case, the project can be used as a reference.

Here’s a quick overview of the setup process using Bee Headers:

Set up a case sensitive volume to fetch Linux and build:

	diskutil apfs addVolume /dev/disk<N> "Case-sensitive APFS" linux
	
Install dependencies:

	brew install coreutils findutils gnu-sed gnu-tar grep llvm make pkg-config
	brew tap bee-headers/bee-headers
	brew install bee-headers/bee-headers/bee-headers

Initialize the environment with `bee-init` and run it in each new shell:

	source bee-init
	
Start build:
	make LLVM=1 defconfig
	make LLVM=1 -j$(nproc)

For more details and manual steps, refer to the README [4] of the Bee
Headers project.

[1] Project: https://github.com/bee-headers

[2] Headers repository: https://github.com/bee-headers/headers.git

[3] Homebrew Tap formula: https://github.com/bee-headers/homebrew-bee-headers.git

[4] https://github.com/bee-headers/homebrew-bee-headers/blob/main/README.md
---
Changes in v3:
- Update drm/xe patch to replace program_invocation_short_name with
argv[0] instead of using getprogname + ifdef as suggested by Masahiro.
- Patch merged: "[PATCH v2 1/8] scripts: subarch.include: fix SUBARCH on
macOS hosts".
- "file2alias: fix uuid_t definitions for macos" patch is dropped. User
requires to set up this in the build environment with something like:
export HOSTCFLAGS="-D_UUID_T -D__GETHOSTUUID_H"
- Drop documentation patch. Environment setup and headers should now be
provided by the user. The project Bee Headers can be used to help with
the steps and documentation.
	- HOSTCFLAGS should be used to provide the missing headers as well as the
above defines. Example using Bee Headers:
export HOSTCFLAGS="$(pkg-config --cflags bee-headers) -D_UUID_T
-D__GETHOSTUUID_H"
	- PATH needs to have all tools the kernel build system depends on.
Something like this:
	PATH="#{HOMEBREW_PREFIX}/opt/coreutils/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/findutils/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/gawk/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/gnu-sed/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/gnu-tar/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/grep/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/make/libexec/gnubin:$PATH"
	PATH="#{HOMEBREW_PREFIX}/opt/llvm/bin:$PATH"
- Drop patches below as they've been replaced by a new 2nd version [8]:
	selinux: move genheaders to security/selinux/
	selinux: do not include <linux/*.h> headers from host programs
[8] Subject: [PATCH v2 1/2] selinux: do not include <linux/*.h> headers from host programs
https://lore.kernel.org/all/[e-mail]/#t
Note: This has been specified as dependency with b4 and message-id in
the cover letter.
- Link to v2: https://lore.kernel.org/r/[e-mail]

Changes in v2:
- Add documentation and set this 'feature' as experimental.
- Update cover letter.
- Drop unnecessary changes. Patches removed:
	- kbuild: add header_install dependency to scripts
	- include: add endian.h support
	- include: add elf.h support
- Update Makefiles to find Bee Headers with pkg-config.
- Update file2alias to solve uuid_t conflicts inside Makefile as
suggested by Nicolas Schier.
- Adapt xe_gen_wa_oob to solve getprogname()/
program_invocation_short_name in runtime. as suggested by Lucas De
Marchi.
- Remove linux/version.h in accessibility/speakup as suggested by
Masahiro Yamada.
- Replace selinux patches with new Masahiro Yamada's patches:
	Message-id: [e-mail]
	Link: https://lore.kernel.org/all/[e-mail]/
- Replace tty/vt with new Masahiro Yamada's patch:
	Message-id: [e-mail]
	Link: https://lore.kernel.org/all/[e-mail]/
	(Already merged in the linux-next tag used)
- Replace scripts/kallsyms patch with Masahiro Yamada's patch:
	Message-id: [e-mail]
	Link: https://lore.kernel.org/all/[e-mail]/
	(Already merged in the linux-next tag used)
- Link to v1: https://lore.kernel.org/r/[e-mail]
---
 drivers/gpu/drm/xe/xe_gen_wa_oob.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


---
base-commit: ef545bc03a65438cabe87beb1b9a15b0ffcb6ace
change-id: 20240807-macos-build-support-9ca0d77adb17
prerequisite-message-id: <[e-mail]>
prerequisite-patch-id: 5d49a803cc75a57174d16745222d1602809aeb96
prerequisite-patch-id: b2da334443fa81626d742053ca5005074e9e1355

Best regards,

Patch

diff --git a/drivers/gpu/drm/xe/xe_gen_wa_oob.c b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
index 904cf47925aa1d5bc37983af83232d5e4697c49e..ed9183599e31cc9d76da3f22c9fb3884384a49bc 100644
--- a/drivers/gpu/drm/xe/xe_gen_wa_oob.c
+++ b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
@@ -28,10 +28,10 @@ 
 	"\n" \
 	"#endif\n"
 
-static void print_usage(FILE *f)
+static void print_usage(FILE *f, const char *progname)
 {
 	fprintf(f, "usage: %s <input-rule-file> <generated-c-source-file> <generated-c-header-file>\n",
-		program_invocation_short_name);
+		progname);
 }
 
 static void print_parse_error(const char *err_msg, const char *line,
@@ -144,7 +144,7 @@  int main(int argc, const char *argv[])
 
 	if (argc < 3) {
 		fprintf(stderr, "ERROR: wrong arguments\n");
-		print_usage(stderr);
+		print_usage(stderr, argv[0]);
 		return 1;
 	}