[Bug 272744] cxgbe firmware fails to build on i386

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272744

--- Comment #3 from commit-hook@FreeBSD.org ---
A commit in branch main references this bug:

URL:
https://cgit.FreeBSD.org/src/commit/?id=8a6ab0f71f1857037233fae19991b972b430d83c

commit 8a6ab0f71f1857037233fae19991b972b430d83c
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-28 04:08:43 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-07-28 04:08:43 +0000

    Pre-quote macros passed to .incbin to avoid unwanted substitution

    Currently for the MFS, firmware and VDSO template assembly files we pass
    the path to include with .incbin unquoted and use __XSTRING within the
    assembly file to stringify it. However, __XSTRING doesn't just perform a
    single level of expansion, it performs the normal full expansion of the
    macro, and so if the path itself happens to tokenise to something that
    includes a defined macro in it that will itself be substituted. For
    example, with #define MACRO 1, a path like /path/containing/MACRO/in/it
    will expand to /path/containing/1/in/it and then, when stringified, end
    up as "/path/containing/1/in/it", not the intended string. Normally,
    macros have names that start or end witih underscores and are unlikely
    to appear in a tokenised path (even if technically they could), but now
    that we've switched to GNU C as of commit ec41a96daaa6 ("sys: Switch the
    kernel's C standard from C99 to GNU99.") there are a few new macros
    defined which don't start or end with underscores: unix, which is always
    defined to 1, and i386, which is defined to 1 on i386. The former
    probably doesn't appear in user paths in practice, but the latter has
    been seen to and is likely quite common in the wild.

    Fix this by defining the macro pre-quoted instead of using __XSTRING.
    Note that technically we don't need to do this for vdso_wrap.S today as
    all the paths passed to it are safe file names with no user-controlled
    prefix but we should do it anyway for consistency and robustness against
    future changes.

    This allows make tinderbox to pass when built with source and object
    directories inside ~/path-with-unix, which would otherwise expand to
    ~/path-with-1 and break.

    PR:     272744
    Fixes:  ec41a96daaa6 ("sys: Switch the kernel's C standard from C99 to
GNU99.")

 sys/conf/kern.post.mk        | 2 +-
 sys/conf/kern.pre.mk         | 2 +-
 sys/conf/kmod.mk             | 2 +-
 sys/dev/md/embedfs.S         | 2 +-
 sys/kern/firmw.S             | 2 +-
 sys/tools/amd64_ia32_vdso.sh | 2 +-
 sys/tools/amd64_vdso.sh      | 2 +-
 sys/tools/vdso_wrap.S        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

-- 
You are receiving this mail because:
You are the assignee for the bug.