From 2a26adf1d8bb511bfea14abefc5cd538d695e51e Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 18 Oct 2016 19:12:19 +0000 Subject: [PATCH] xtensa: don't use unwind-dw2-fde-dip with elf targets Define LIB2ADDEH_XTENSA_UNWIND_DW2_FDE to unwind-dw2-fde.c in xtensa/t-elf and to unwind-dw2-fde-dip.c in xtensa/t-linux and use LIB2ADDEH_XTENSA_UNWIND_DW2_FDE in LIB2ADDEH definition. This fixes build for elf target with windowed xtensa core that currently breaks with the following error message: unwind-dw2-fde-dip.c:36:40: fatal error: elf.h: No such file or directory 2016-10-18 Max Filippov libgcc/ * config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New definition. * config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New definition. * config/xtensa/t-windowed (LIB2ADDEH): Use LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf or xtensa/t-linux. From-SVN: r241313 --- libgcc/ChangeLog | 10 ++++++++++ libgcc/config/xtensa/t-elf | 2 ++ libgcc/config/xtensa/t-linux | 2 ++ libgcc/config/xtensa/t-windowed | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b98f6d49f3f..baad2c1213c 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,13 @@ +2016-10-18 Max Filippov + + * config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New + definition. + * config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New + definition. + * config/xtensa/t-windowed (LIB2ADDEH): Use + LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf + or xtensa/t-linux. + 2016-10-18 Ding-Kai Chen * config/xtensa/ieee754-df.S (__recipdf2, __rsqrtdf2, diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf index 59d51210b95..967cf9bfa6c 100644 --- a/libgcc/config/xtensa/t-elf +++ b/libgcc/config/xtensa/t-elf @@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls CRTSTUFF_T_CFLAGS_S += -mlongcalls HOST_LIBGCC2_CFLAGS += -mlongcalls + +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux index 6f4ae893486..412eccae18b 100644 --- a/libgcc/config/xtensa/t-linux +++ b/libgcc/config/xtensa/t-linux @@ -1 +1,3 @@ SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver + +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed index a99156cc217..f140136277e 100644 --- a/libgcc/config/xtensa/t-windowed +++ b/libgcc/config/xtensa/t-windowed @@ -1,2 +1,2 @@ LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ - $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c + $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c