On Thu, Sep 26, 2024 at 10:28 AM Andrew Pinski <pins...@gmail.com> wrote: > > On Thu, Sep 26, 2024 at 10:15 AM Matthieu Longo <matthieu.lo...@arm.com> > wrote: > > > > A previous patch ([1]) introduced a build regression on aarch64-none-elf > > target. The changes were primarilly tested on aarch64-unknown-linux-gnu, > > so the issue was missed during development. > > The includes are slighly different between the two targets, and due to some > > include rules ([2]), "aarch64-unwind-def.h" was not found. > > > > [1]: > > https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=bdf41d627c13bc5f0dc676991f4513daa9d9ae36 > > > > [2]: https://gcc.gnu.org/onlinedocs/cpp/Include-Syntax.html > > > include "file" > > > ... It searches for a file named file first in the directory > > > containing the current file, ... > > Can you provide more information on this because I am not sure this is > the right fix. > aarch64-unwind.h and aarch64-unwind-def.h are in the same directory so > an include from aarch64-unwind.h should find aarch64-unwind-def.h that > is in the same directory. > Maybe post what strace shows to see what files are being looked for.
Oh looking into the issue some more, aarch64-unwind.h gets linked to md-unwind-support.h in the build directory and that is used. I see there was a new makefile target added for md-unwind-def.h. Maybe this should be including md-unwind-def.h instead of aarch64-unwind-def.h. Thanks, Andrew Pinski > > Thanks, > Andrew Pinski > > > > > libgcc/ChangeLog: > > > > * config/aarch64/aarch64-unwind.h: fix header path. > > --- > > libgcc/config/aarch64/aarch64-unwind.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libgcc/config/aarch64/aarch64-unwind.h > > b/libgcc/config/aarch64/aarch64-unwind.h > > index 2b774eb263c..4d36f0b26f7 100644 > > --- a/libgcc/config/aarch64/aarch64-unwind.h > > +++ b/libgcc/config/aarch64/aarch64-unwind.h > > @@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. > > If not, see > > #if !defined (AARCH64_UNWIND_H) && !defined (__ILP32__) > > #define AARCH64_UNWIND_H > > > > -#include "aarch64-unwind-def.h" > > +#include "config/aarch64/aarch64-unwind-def.h" > > > > #include "ansidecl.h" > > #include <stdbool.h> > > -- > > 2.46.1 > >
