Date: Sun, 12 May 2013 21:39:05 +0200 From: Tijl Coosemans <tijl@coosemans.org> To: Gabor Pali <pgj@FreeBSD.org> Cc: office@freebsd.org Subject: Re: Fixing USE_GCC for LibreOffice on i386 Message-ID: <518FEFD9.6000005@coosemans.org> In-Reply-To: <CAHnG2CzC=EUSPNO9MCgMQNe3Vf-93D=2mfnsY_CxN_2mgBpTzA@mail.gmail.com> References: <518D61C1.7020402@gmail.com> <518E129C.9010208@coosemans.org> <CAHnG2Cz_-yovV5mKt4TOHx=VhF6WJ-UEfDQmghn%2Bo30BKgXoGg@mail.gmail.com> <518F72C9.9060107@coosemans.org> <CAHnG2CzC=EUSPNO9MCgMQNe3Vf-93D=2mfnsY_CxN_2mgBpTzA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2FKQSSWUBVBFIDMICTJCH Content-Type: multipart/mixed; boundary="------------040100030707060504010405" This is a multi-part message in MIME format. --------------040100030707060504010405 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 2013-05-12 17:28, Gabor Pali wrote: > On Sun, May 12, 2013 at 12:45 PM, Tijl Coosemans <tijl@coosemans.org> w= rote: >> Can you test if creating /etc/libmap.conf helps? >=20 > No, it does not help. Note that soffice.bin uses the right version of > libstdc++ from base: >=20 > $ ldd /usr/local/lib/libreoffice/program/soffice.bin > /usr/local/lib/libreoffice/program/soffice.bin: > .. > libstdc++.so.6 =3D> /usr/lib/libstdc++.so.6 (0x28138000) > .. >=20 > This is quite sensible to me as poudriere did not pull anything that > would depend on lang/gcc* while building the packages. (I started > from scratch.) >=20 > The application dies at the same place as before (excerpt from gdbtrace= =2Elog): Ok. One other thing I thought of is this patch: http://llvm.org/viewvc/llvm-project?view=3Drevision&revision=3D175057 It has been applied to base system llvm, but not port llvm: http://svnweb.freebsd.org/base?view=3Drevision&revision=3D246858 Can you put the attached patch in devel/llvm/files/ and rebuild llvm, clang and libreoffice? --------------040100030707060504010405 Content-Type: text/plain; charset=ISO-8859-15; name="patch-lib-Target-X86-X86SelectionDAGInfo.cpp" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="patch-lib-Target-X86-X86SelectionDAGInfo.cpp" --- lib/Target/X86/X86SelectionDAGInfo.cpp.orig +++ lib/Target/X86/X86SelectionDAGInfo.cpp @@ -202,6 +202,14 @@ SrcPtrInfo.getAddrSpace() >=3D 256) return SDValue(); =20 + // ESI might be used as a base pointer, in that case we can't simply o= verwrite + // the register. Fall back to generic code. + const X86RegisterInfo *TRI =3D + static_cast<const X86RegisterInfo *>(DAG.getTarget().getRegisterIn= fo()); + if (TRI->hasBasePointer(DAG.getMachineFunction()) && + TRI->getBaseRegister() =3D=3D X86::ESI) + return SDValue(); + MVT AVT; if (Align & 1) AVT =3D MVT::i8; --------------040100030707060504010405-- ------enig2FKQSSWUBVBFIDMICTJCH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iF4EAREIAAYFAlGP7+EACgkQfoCS2CCgtiveywD9HS6pkC65701YDpJvxLucemyq EJ2jM8LnCjtArlDbf+IA/AwNfB9OHH6rEqKlCIq+2MD6bmuZx/thIHh33RCtylZY =gDRx -----END PGP SIGNATURE----- ------enig2FKQSSWUBVBFIDMICTJCH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?518FEFD9.6000005>