On Sunday, May 4th, 2025 at 05:07, Mark Millard <mark...@yahoo.com> wrote:

> 
> 
> FYI:
> 
> /wrkdirs/usr/ports/lang/gcc15/work/gcc-15.1.0/libgcc/unwind-dw2-fde-dip.c:69:10:
>  error: 'ElfW' redefined [-Werror]
> 69 | # define ElfW __ElfN
> | ^~~~
> In file included from /usr/include/machine/elf.h:45,
> from /usr/include/elf.h:37,
> from 
> /wrkdirs/usr/ports/lang/gcc15/work/gcc-15.1.0/libgcc/unwind-dw2-fde-dip.c:36:
> /usr/include/sys/elf_generic.h:59:9: note: this is the location of the 
> previous definition
> 59 | #define ElfW(x) __ElfN(x)
> | ^~~~

Hi Mark,

Could you please test the patch below? Unfortunately,
I am overwhelmed with patches testing, I need a bit of help :)

Also, could you please check if the issue affects lang/gcc15-devel
too?

Thanks!

Lorenzo Salvadore

--- libgcc/unwind-dw2-fde-dip.c.orig    2025-05-04 08:11:36 UTC
+++ libgcc/unwind-dw2-fde-dip.c
@@ -32,7 +32,7 @@
 
 #include "tconfig.h"
 #include "tsystem.h"
-#if !defined(inhibit_libc) && !defined(__OpenBSD__)
+#if !defined(inhibit_libc) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #include <elf.h>               /* Get DT_CONFIG.  */
 #endif
 #include "coretypes.h"

Reply via email to