Date: Tue, 18 Oct 2011 20:13:23 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: Dimitry Andric <dim@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226518 - head/contrib/llvm/tools/clang/lib/Basic Message-ID: <CAGH67wRwGOZjPVUGCBONEvDmbkkjvFhBU_09_T260=7tRnZHVw@mail.gmail.com> In-Reply-To: <CAGH67wQU87RLqf=9BZiPHkyP0Lk6-JFv%2B9kKMBDsX7SBKZBuNQ@mail.gmail.com> References: <201110181737.p9IHbIvW083474@svn.freebsd.org> <CAGH67wQU87RLqf=9BZiPHkyP0Lk6-JFv%2B9kKMBDsX7SBKZBuNQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 18, 2011 at 8:08 PM, Garrett Cooper <yanegomi@gmail.com> wrote: > On Tue, Oct 18, 2011 at 10:37 AM, Dimitry Andric <dim@freebsd.org> wrote: >> Author: dim >> Date: Tue Oct 18 17:37:18 2011 >> New Revision: 226518 >> URL: http://svn.freebsd.org/changeset/base/226518 >> >> Log: >> =A0Fix the way clang retrieves the major FreeBSD release number from the >> =A0target triple, so that the __FreeBSD__ and __FreeBSD_cc_version built= in >> =A0macros return the expected results. >> >> =A0Spotted by: =A0 nalitoja at gmail.com >> >> Modified: >> =A0head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp >> >> Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Oct 18 16:37= :28 2011 =A0 =A0 =A0 =A0(r226517) >> +++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Oct 18 17:37= :18 2011 =A0 =A0 =A0 =A0(r226518) >> @@ -238,11 +238,12 @@ protected: >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 MacroBuilder &Bu= ilder) const { >> =A0 =A0 // FreeBSD defines; list based off of gcc output >> >> - =A0 =A0// FIXME: Move version number handling to llvm::Triple. >> - =A0 =A0llvm::StringRef Release =3D Triple.getOSName().substr(strlen("f= reebsd"), 1); >> + =A0 =A0unsigned Release =3D Triple.getOSMajorVersion(); >> + =A0 =A0if (Release =3D=3D 0U) >> + =A0 =A0 =A0Release =3D 8U; >> >> - =A0 =A0Builder.defineMacro("__FreeBSD__", Release); >> - =A0 =A0Builder.defineMacro("__FreeBSD_cc_version", Release + "00001"); >> + =A0 =A0Builder.defineMacro("__FreeBSD__", Twine(Release)); >> + =A0 =A0Builder.defineMacro("__FreeBSD_cc_version", Twine(Release * 100= 000U + 1U)); >> =A0 =A0 Builder.defineMacro("__KPRINTF_ATTRIBUTE__"); >> =A0 =A0 DefineStd(Builder, "unix", Opts); >> =A0 =A0 Builder.defineMacro("__ELF__"); > > It looks like this commit broke tinderbox for multiple archs. Rather than just complaining, I figured I should provide a fix (note the llvm namespace scoping operators for the Twine method)... -Garrett $ svn diff contrib/llvm/tools/clang/lib/Basic/Targets.cpp Index: contrib/llvm/tools/clang/lib/Basic/Targets.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- contrib/llvm/tools/clang/lib/Basic/Targets.cpp (revision 226524) +++ contrib/llvm/tools/clang/lib/Basic/Targets.cpp (working copy) @@ -242,8 +242,9 @@ if (Release =3D=3D 0U) Release =3D 8U; - Builder.defineMacro("__FreeBSD__", Twine(Release)); - Builder.defineMacro("__FreeBSD_cc_version", Twine(Release * 100000U + = 1U)); + Builder.defineMacro("__FreeBSD__", llvm::Twine(Release)); + Builder.defineMacro("__FreeBSD_cc_version", + llvm::Twine(Release * 100000U + 1U)); Builder.defineMacro("__KPRINTF_ATTRIBUTE__"); DefineStd(Builder, "unix", Opts); Builder.defineMacro("__ELF__");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wRwGOZjPVUGCBONEvDmbkkjvFhBU_09_T260=7tRnZHVw>