[PATCH] D21484: AMDGPU/SI: Add support for R_AMDGPU_GOTPCREL

[Matt Arsenault via llvm-commits]

arsenm added inline comments.

================
Comment at: lib/Target/AMDGPU/SIISelLowering.cpp:505
@@ +504,3 @@
+  // Sometimes LDS instructions have constant pointers.
+  // If Ptr is null, then thatg means this mem operand contains a
+  // PseudoSourceValue like GOT.
----------------
Typo 'thatg'

================
Comment at: lib/Target/AMDGPU/SIISelLowering.cpp:1428-1434
@@ -1424,13 +1427,9 @@
 
-bool
-SITargetLowering::isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const {
-  if (GA->getAddressSpace() != AMDGPUAS::GLOBAL_ADDRESS)
-    return false;
-
-  return TargetLowering::isOffsetFoldingLegal(GA);
-}
-
-SDValue SITargetLowering::LowerGlobalAddress(AMDGPUMachineFunction *MFI,
-                                             SDValue Op,
-                                             SelectionDAG &DAG) const {
-  GlobalAddressSDNode *GSD = cast<GlobalAddressSDNode>(Op);
+SDValue SITargetLowering::lowerTRAP(SDValue Op,
+                                    SelectionDAG &DAG) const {
+  const MachineFunction &MF = DAG.getMachineFunction();
+  DiagnosticInfoUnsupported NoTrap(*MF.getFunction(),
+                                   "trap handler not supported",
+                                   Op.getDebugLoc(),
+                                   DS_Warning);
+  DAG.getContext()->diagnose(NoTrap);
----------------
This looks like a broken merge


http://reviews.llvm.org/D21484