Commit 6b29aa21 authored by Alexey Bataev's avatar Alexey Bataev
Browse files

Revert "[OPENMP]Do not use RTTI by default for NVPTX devices." 

This reverts commit 23058f9d. It breaks
builds of cuda code somehow in some cases.
parent 313d8972

clang/lib/Driver/ToolChain.cpp

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ static ToolChain::RTTIMode CalculateRTTIMode(const ArgList &Args, 
  }



  // -frtti is default, except for the PS4 CPU.

  return (Triple.isPS4CPU() || Triple.isNVPTX()) ? ToolChain::RM_Disabled

                                                 : ToolChain::RM_Enabled;

  return (Triple.isPS4CPU()) ? ToolChain::RM_Disabled : ToolChain::RM_Enabled;

}



ToolChain::ToolChain(const Driver &D, const llvm::Triple &T,

clang/test/Driver/openmp-offload-gpu.cpp

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
///

/// Perform several driver tests for OpenMP offloading

///



// REQUIRES: clang-driver

// REQUIRES: x86-registered-target

// REQUIRES: powerpc-registered-target

// REQUIRES: nvptx-registered-target



/// ###########################################################################



/// PTXAS is passed -c flag by default when offloading to an NVIDIA device using OpenMP

/// Check that the flag is passed when -fopenmp-relocatable-target is used.

// RUN:   %clangxx -### -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda \

// RUN:          -save-temps -no-canonical-prefixes %s -x c++ -c 2>&1 \

// RUN:   | FileCheck -check-prefix=CHK-RTTI %s



// CHK-RTTI: clang{{.*}}" "-triple" "nvptx64-nvidia-cuda"

// CHK-RTTI-SAME: "-fno-rtti"