| Message ID | 20161105171418.GK27313@waldemar-brodkorb.de |
|---|---|
| State | New |
| Headers | show |
On 11/05/2016 06:14 PM, Waldemar Brodkorb wrote: > Hi, > > the following patch fixes PR68468. > Patch is used for a while in Buildroot without issues. > > 2016-11-05 Waldemar Brodkorb <wbx@openadk.org> > > PR gcc/68468 > * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. This is ok. Bernd
On Wed, Nov 09, 2016 at 04:08:39PM +0100, Bernd Schmidt wrote: > On 11/05/2016 06:14 PM, Waldemar Brodkorb wrote: > >Hi, > > > >the following patch fixes PR68468. > >Patch is used for a while in Buildroot without issues. > > > >2016-11-05 Waldemar Brodkorb <wbx@openadk.org> Two spaces before < instead of just one. > > > > PR gcc/68468 PR libgcc/68468 instead. > > * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. Capital F in Fix. No libgcc/ prefix for files in libgcc/ChangeLog. > This is ok. I think Waldemar does not have SVN write access, are you going to check it in or who will do that? Jakub
Hi, Jakub Jelinek wrote, > On Wed, Nov 09, 2016 at 04:08:39PM +0100, Bernd Schmidt wrote: > > On 11/05/2016 06:14 PM, Waldemar Brodkorb wrote: > > >Hi, > > > > > >the following patch fixes PR68468. > > >Patch is used for a while in Buildroot without issues. > > > > > >2016-11-05 Waldemar Brodkorb <wbx@openadk.org> > > Two spaces before < instead of just one. > > > > > > PR gcc/68468 > > PR libgcc/68468 > instead. > > > > * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. > > Capital F in Fix. > No libgcc/ prefix for files in libgcc/ChangeLog. > > > This is ok. > > I think Waldemar does not have SVN write access, are you going to check it > in or who will do that? Should I resend the patch with the suggested fixes or will someone with write access fix it up for me? Thanks Waldemar
On Wed, Nov 16, 2016 at 07:31:59AM +0100, Waldemar Brodkorb wrote: > > On Wed, Nov 09, 2016 at 04:08:39PM +0100, Bernd Schmidt wrote: > > > On 11/05/2016 06:14 PM, Waldemar Brodkorb wrote: > > > >Hi, > > > > > > > >the following patch fixes PR68468. > > > >Patch is used for a while in Buildroot without issues. > > > > > > > >2016-11-05 Waldemar Brodkorb <wbx@openadk.org> > > > > Two spaces before < instead of just one. > > > > > > > > PR gcc/68468 > > > > PR libgcc/68468 > > instead. > > > > > > * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. > > > > Capital F in Fix. > > No libgcc/ prefix for files in libgcc/ChangeLog. > > > > > This is ok. > > > > I think Waldemar does not have SVN write access, are you going to check it > > in or who will do that? > > Should I resend the patch with the suggested fixes or will someone > with write access fix it up for me? As nobody committed it yet, I've made the changes and committed it for you. Jakub
Hi Jakub, Jakub Jelinek wrote, > On Wed, Nov 16, 2016 at 07:31:59AM +0100, Waldemar Brodkorb wrote: > > > On Wed, Nov 09, 2016 at 04:08:39PM +0100, Bernd Schmidt wrote: > > > > On 11/05/2016 06:14 PM, Waldemar Brodkorb wrote: > > > > >Hi, > > > > > > > > > >the following patch fixes PR68468. > > > > >Patch is used for a while in Buildroot without issues. > > > > > > > > > >2016-11-05 Waldemar Brodkorb <wbx@openadk.org> > > > > > > Two spaces before < instead of just one. > > > > > > > > > > PR gcc/68468 > > > > > > PR libgcc/68468 > > > instead. > > > > > > > > * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. > > > > > > Capital F in Fix. > > > No libgcc/ prefix for files in libgcc/ChangeLog. > > > > > > > This is ok. > > > > > > I think Waldemar does not have SVN write access, are you going to check it > > > in or who will do that? > > > > Should I resend the patch with the suggested fixes or will someone > > with write access fix it up for me? > > As nobody committed it yet, I've made the changes and committed it for you. Thanks! Waldemar
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index f7a1c3f..801bce8 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -124,7 +124,11 @@ static struct frame_hdr_cache_element { _Unwind_Ptr pc_low; _Unwind_Ptr pc_high; +#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__ + struct elf32_fdpic_loadaddr load_base; +#else _Unwind_Ptr load_base; +#endif const ElfW(Phdr) *p_eh_frame_hdr; const ElfW(Phdr) *p_dynamic; struct frame_hdr_cache_element *link; @@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr; const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic; long n, match; -#ifdef __FRV_FDPIC__ +#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__ struct elf32_fdpic_loadaddr load_base; #else _Unwind_Ptr load_base; @@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) break; } } -# elif defined __FRV_FDPIC__ && defined __linux__ +# elif (defined __FRV_FDPIC__ || defined __BFIN_FDPIC__) && defined __linux__ data->dbase = load_base.got_value; # else # error What is DW_EH_PE_datarel base on this platform?
Hi, the following patch fixes PR68468. Patch is used for a while in Buildroot without issues. 2016-11-05 Waldemar Brodkorb <wbx@openadk.org> PR gcc/68468 * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. Best regards Waldemar