[cfe-commits] r84176 - in /cfe/trunk/lib: Driver/ToolChains.cpp Driver/Tools.cpp Frontend/InitHeaderSearch.cpp

[Daniel Dunbar]

Hi Edward,

Some nits...

On Thu, Oct 15, 2009 at 12:44 AM, Edward O'Callaghan
<eocallaghan at auroraux.org> wrote:
> Author: evocallaghan
> Date: Thu Oct 15 02:44:07 2009
> New Revision: 84176
>
> URL: http://llvm.org/viewvc/llvm-project?rev=84176&view=rev
> Log:
> AuroraUX toolchain fixes.
>
> Modified:
>    cfe/trunk/lib/Driver/ToolChains.cpp
>    cfe/trunk/lib/Driver/Tools.cpp
>    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
>
> Modified: cfe/trunk/lib/Driver/ToolChains.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=84176&r1=84175&r2=84176&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains.cpp Thu Oct 15 02:44:07 2009
> @@ -676,6 +676,7 @@
>   getFilePaths().push_back("/usr/lib");
>   getFilePaths().push_back("/usr/sfw/lib");
>   getFilePaths().push_back("/opt/gcc4/lib");
> +  getFilePaths().push_back("/opt/gcc4/lib/gcc/i386-pc-solaris2.11/4.2.4");
>
>  }
>
>
> Modified: cfe/trunk/lib/Driver/Tools.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=84176&r1=84175&r2=84176&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Driver/Tools.cpp (original)
> +++ cfe/trunk/lib/Driver/Tools.cpp Thu Oct 15 02:44:07 2009
> @@ -2164,13 +2164,14 @@
>   if ((!Args.hasArg(options::OPT_nostdlib)) &&
>      (!Args.hasArg(options::OPT_shared))) {
>     CmdArgs.push_back("-e");
> -    CmdArgs.push_back("__start");
> +    CmdArgs.push_back("_start");
>   }
>
>   if (Args.hasArg(options::OPT_static)) {
>     CmdArgs.push_back("-Bstatic");
> +    CmdArgs.push_back("-dn");
>   } else {
> -    CmdArgs.push_back("--eh-frame-hdr");
> +//    CmdArgs.push_back("--eh-frame-hdr");

Please don't leave commented out code in, unless it's commented why it
is is commented out (and its for a good reason).

>     CmdArgs.push_back("-Bdynamic");
>     if (Args.hasArg(options::OPT_shared)) {
>       CmdArgs.push_back("-shared");
> @@ -2193,11 +2194,14 @@
>   if (!Args.hasArg(options::OPT_nostdlib) &&
>       !Args.hasArg(options::OPT_nostartfiles)) {
>     if (!Args.hasArg(options::OPT_shared)) {
> -      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crt0.o")));
> +      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crt1.o")));
> +      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crti.o")));
>       CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtbegin.o")));
>     } else {
> -      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtbeginS.o")));
> +      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crti.o")));
> +//      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtbeginS.o")));
>     }
> +    CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtn.o")));
>   }
>
>   CmdArgs.push_back(MakeFormattedString(Args,
> @@ -2242,8 +2246,8 @@
>       !Args.hasArg(options::OPT_nostartfiles)) {
>     if (!Args.hasArg(options::OPT_shared))
>       CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtend.o")));
> -    else
> -      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtendS.o")));
> +//    else
> +//      CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtendS.o")));
>   }
>
>   const char *Exec =
>
> Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=84176&r1=84175&r2=84176&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
> +++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Thu Oct 15 02:44:07 2009
> @@ -400,6 +400,8 @@
>           AddPath("/usr/include/c++/4.2", System, true, false, false);
>           break;
>         case llvm::Triple::Solaris:
> +          // Solaris - Fall though..

This comment isn't necessary, since there is no code in between (and
though is misspelled).

 - Daniel

> +        case llvm::Triple::AuroraUX:
>           // AuroraUX
>           AddGnuCPlusPlusIncludePaths("/opt/gcc4/include/c++/4.2.4",
>                                       "i386-pc-solaris2.11",
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>