Message ID | 39547344-5624-4978-8FA5-184E6874DE18@sandoe.co.uk |
---|---|
State | New |
Headers | show |
Series | [pushed] Darwin, X86 : Fix bootstrap break from flags changes. | expand |
On 4/21/21 9:50 PM, Iain Sandoe wrote: > Hi, > > @Martin Hello. Sorry for the troubles I caused. > I am not sure from the commit messages for this series whether my change > below is complete (it is enough to make bootstrap succeed so I have > applied it anyway). > > you mention TARGET_* but that is too general - however i386/darwin.h does > have some other ISA-specific TARGET_* settings (mostly from well before > my time) so I cannot be 100% sure if more should be removed/changed. > > If you could take a quick look it would be appreciated - I don’t have much state > for the patch you applied. The patch looks correct to me. Thanks, Martin > > thanks > Iain > > ===== > > The changes from r12-36-g1751bec027f030515889fcf4baa9c91501aafc85 > did not remove the uses of TARGET_ISA_* from i386/darwin.h. > > Fixed thus. > > gcc/ChangeLog: > > * config/i386/darwin.h (TARGET_64BIT): Remove definition > based on TARGET_ISA_64BIT. > (TARGET_64BIT_P): Remove definition based on > TARGET_ISA_64BIT_P(). > --- > gcc/config/i386/darwin.h | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h > index c81db9bf09f..2657dfe266e 100644 > --- a/gcc/config/i386/darwin.h > +++ b/gcc/config/i386/darwin.h > @@ -25,11 +25,6 @@ along with GCC; see the file COPYING3. If not see > #undef DARWIN_X86 > #define DARWIN_X86 1 > > -#undef TARGET_64BIT > -#define TARGET_64BIT TARGET_ISA_64BIT > -#undef TARGET_64BIT_P > -#define TARGET_64BIT_P(x) TARGET_ISA_64BIT_P(x) > - > #ifdef IN_LIBGCC2 > #undef TARGET_64BIT > #ifdef __x86_64__
Martin Liška <mliska@suse.cz> wrote: > On 4/21/21 9:50 PM, Iain Sandoe wrote: >> >> If you could take a quick look it would be appreciated - I don’t have >> much state >> for the patch you applied. > > The patch looks correct to me. thanks! Iain
Hi Iain, > @Martin > I am not sure from the commit messages for this series whether my change > below is complete (it is enough to make bootstrap succeed so I have > applied it anyway). > > you mention TARGET_* but that is too general - however i386/darwin.h does > have some other ISA-specific TARGET_* settings (mostly from well before > my time) so I cannot be 100% sure if more should be removed/changed. > > If you could take a quick look it would be appreciated - I don’t have much > state > for the patch you applied. while this patch fixed the x86_64-darwin bootstrap, i?86-darwin is still broken: configuring the 64-bit libgcc in stage 1 fails with configure:3804: /var/gcc/regression/master/10.8-gcc-32/build/./gcc/xgcc -B/var/gcc/regression/master/10.8-gcc-32/build/./gcc/ -B/vol/gcc/i386-apple-darwin12.6.0/bin/ -B/vol/gcc/i386-apple-darwin12.6.0/lib/ -isystem /vol/gcc/i386-apple-darwin12.6.0/include -isystem /vol/gcc/i386-apple-darwin12.6.0/sys-include -fno-checking -m64 -c -g -O2 conftest.c >&5 cc1: sorry, unimplemented: 64-bit mode not compiled in I haven't tried investigating what's going on here. Rainer
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: > Hi Iain, > >> @Martin >> I am not sure from the commit messages for this series whether my change >> below is complete (it is enough to make bootstrap succeed so I have >> applied it anyway). >> >> you mention TARGET_* but that is too general - however i386/darwin.h does >> have some other ISA-specific TARGET_* settings (mostly from well before >> my time) so I cannot be 100% sure if more should be removed/changed. >> >> If you could take a quick look it would be appreciated - I don’t have much >> state >> for the patch you applied. > > while this patch fixed the x86_64-darwin bootstrap, i?86-darwin is still > broken: configuring the 64-bit libgcc in stage 1 fails with > > configure:3804: /var/gcc/regression/master/10.8-gcc-32/build/./gcc/xgcc > -B/var/gcc/regression/master/10.8-gcc-32/build/./gcc/ > -B/vol/gcc/i386-apple-darwin12.6.0/bin/ > -B/vol/gcc/i386-apple-darwin12.6.0/lib/ -isystem > /vol/gcc/i386-apple-darwin12.6.0/include -isystem > /vol/gcc/i386-apple-darwin12.6.0/sys-include -fno-checking -m64 -c -g > -O2 conftest.c >&5 > cc1: sorry, unimplemented: 64-bit mode not compiled in > > I haven't tried investigating what's going on here. PR100269, I can’t exactly see the fix either. Iain
Hi Iain, >> cc1: sorry, unimplemented: 64-bit mode not compiled in >> >> I haven't tried investigating what's going on here. > > PR100269, I can’t exactly see the fix either. ah, thanks: I'd searched for the error message above in bugzilla, but somehow this PR isn't found. Rainer
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index c81db9bf09f..2657dfe266e 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -25,11 +25,6 @@ along with GCC; see the file COPYING3. If not see #undef DARWIN_X86 #define DARWIN_X86 1 -#undef TARGET_64BIT -#define TARGET_64BIT TARGET_ISA_64BIT -#undef TARGET_64BIT_P -#define TARGET_64BIT_P(x) TARGET_ISA_64BIT_P(x) - #ifdef IN_LIBGCC2 #undef TARGET_64BIT #ifdef __x86_64__