Commit b8ae7603 authored by Chandler Carruth's avatar Chandler Carruth
Browse files

Revert some Hexagon builtin commits to match reverts done to LLVM in 

r155047. See the LLVM log for the primary motivation:
  http://llvm.org/viewvc/llvm-project?rev=155047&view=rev

Primary commit r154828:
  - Several issues were raised in review, and fixed in subsequent
    commits.
  - Follow-up commits also reverted, and which should be folded into the
    original before reposting:
    - r154837: Re-add the 'undef BUILTIN' thing to fix the build.
    - r154928: Fix build warnings, re-add (and correct) header and
      license
    - r154937: Typo fix.

Please resubmit this patch with the relevant LLVM resubmission.

llvm-svn: 155048
parent b415bf98

clang/include/clang/Basic/BuiltinsHexagon.def

+672 −860

File changed.

Preview size limit exceeded, changes collapsed.

clang/include/clang/Driver/Options.td

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ def i_Group : OptionGroup<"<i group>">, Group<CompileOnly_Group>; 
def clang_i_Group         : OptionGroup<"<clang i group>">, Group<i_Group>;

def m_Group               : OptionGroup<"<m group>">, Group<CompileOnly_Group>;

def m_x86_Features_Group  : OptionGroup<"<m x86 features group>">, Group<m_Group>;

def m_hexagon_Features_Group  : OptionGroup<"<m hexagon features group>">, Group<m_Group>;

def u_Group               : OptionGroup<"<u group>">;



def pedantic_Group        : OptionGroup<"<pedantic group>">,
@@ -952,7 +951,6 @@ def _warn_ : Joined<"--warn-">, Alias<W_Joined>; 
def _write_dependencies : Flag<"--write-dependencies">, Alias<MD>;

def _write_user_dependencies : Flag<"--write-user-dependencies">, Alias<MMD>;

def _ : Joined<"--">, Flags<[Unsupported]>;

def mieee_rnd_near : Flag<"-mieee-rnd-near">, Group<m_hexagon_Features_Group>;



// Special internal option to handle -Xlinker --no-demangle.

def Z_Xlinker__no_demangle : Flag<"-Z-Xlinker-no-demangle">,

clang/lib/Basic/Targets.cpp

+2 −11
Original line number Diff line number Diff line
@@ -3015,8 +3015,8 @@ public: 
  HexagonTargetInfo(const std::string& triple) : TargetInfo(triple)  {

    BigEndian = false;

    DescriptionString = ("e-p:32:32:32-"

                         "i64:64:64-i32:32:32-i16:16:16-i1:32:32"

                         "f64:64:64-f32:32:32-a0:0-n32");

                         "i64:64:64-i32:32:32-"

                         "i16:16:16-i1:32:32-a:0:0");



    // {} in inline assembly are packet specifiers, not assembly variant

    // specifiers.
@@ -3057,7 +3057,6 @@ public: 
      .Case("hexagonv2", "2")

      .Case("hexagonv3", "3")

      .Case("hexagonv4", "4")

      .Case("hexagonv5", "5")

      .Default(0);

  }
@@ -3112,14 +3111,6 @@ void HexagonTargetInfo::getTargetDefines(const LangOptions &Opts, 
      Builder.defineMacro("__QDSP6_ARCH__", "4");

    }

  }

  else if(CPU == "hexagonv5") {

    Builder.defineMacro("__HEXAGON_V5__");

    Builder.defineMacro("__HEXAGON_ARCH__", "5");

    if(Opts.HexagonQdsp6Compat) {

      Builder.defineMacro("__QDSP6_V5__");

      Builder.defineMacro("__QDSP6_ARCH__", "5");

    }

  }

}



const char * const HexagonTargetInfo::GCCRegNames[] = {

clang/lib/CodeGen/CGBuiltin.cpp

+155 −749

File changed.

Preview size limit exceeded, changes collapsed.

clang/lib/Driver/Tools.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1100,12 +1100,6 @@ void Clang::AddHexagonTargetArgs(const ArgList &Args, 
    A->claim();

  }



  if (!Args.hasArg(options::OPT_fno_short_enums))

    CmdArgs.push_back("-fshort-enums");

  if (Args.getLastArg(options::OPT_mieee_rnd_near)) {

    CmdArgs.push_back ("-mllvm");

    CmdArgs.push_back ("-enable-hexagon-ieee-rnd-near");

  }

  CmdArgs.push_back ("-mllvm");

  CmdArgs.push_back ("-machine-sink-split=0");

}