Message ID | 1476746610-7885-1-git-send-email-jcmvbkbc@gmail.com |
---|---|
State | New |
Headers | show |
On Mon, Oct 17, 2016 at 4:23 PM, Max Filippov <jcmvbkbc@gmail.com> wrote: > 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. > > 2016-10-17 Max Filippov <jcmvbkbc@gmail.com> > 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. > > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Approved, please apply.
On Tue, Oct 18, 2016 at 11:22 AM, augustine.sterling@gmail.com <augustine.sterling@gmail.com> wrote: > On Mon, Oct 17, 2016 at 4:23 PM, Max Filippov <jcmvbkbc@gmail.com> wrote: >> 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. >> >> 2016-10-17 Max Filippov <jcmvbkbc@gmail.com> >> 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. >> >> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> > > Approved, please apply. Applied to trunk. Thank you! -- Max
diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf index 59d5121..967cf9b 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 6f4ae89..412ecca 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 a99156c..f140136 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
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. 2016-10-17 Max Filippov <jcmvbkbc@gmail.com> 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. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- libgcc/config/xtensa/t-elf | 2 ++ libgcc/config/xtensa/t-linux | 2 ++ libgcc/config/xtensa/t-windowed | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-)