diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index 96fc539..46c8bf1 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -296,7 +296,7 @@
       if (!X.second) {
         // Found a conflict, replace this global with the previous one.
         GlobalValue *OldGV = X.first->second;
-        GV->replaceAllUsesWith(ConstantExpr::getCast(OldGV, GV->getType()));
+        GV->replaceAllUsesWith(ConstantExpr::getBitCast(OldGV, GV->getType()));
         GV->eraseFromParent();
         Changed = true;
       }
@@ -312,7 +312,7 @@
       if (!X.second) {
         // Found a conflict, replace this global with the previous one.
         GlobalValue *OldGV = X.first->second;
-        GV->replaceAllUsesWith(ConstantExpr::getCast(OldGV, GV->getType()));
+        GV->replaceAllUsesWith(ConstantExpr::getBitCast(OldGV, GV->getType()));
         GV->eraseFromParent();
         Changed = true;
       }
diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index 96fc539..46c8bf1 100644
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -296,7 +296,7 @@
       if (!X.second) {
         // Found a conflict, replace this global with the previous one.
         GlobalValue *OldGV = X.first->second;
-        GV->replaceAllUsesWith(ConstantExpr::getCast(OldGV, GV->getType()));
+        GV->replaceAllUsesWith(ConstantExpr::getBitCast(OldGV, GV->getType()));
         GV->eraseFromParent();
         Changed = true;
       }
@@ -312,7 +312,7 @@
       if (!X.second) {
         // Found a conflict, replace this global with the previous one.
         GlobalValue *OldGV = X.first->second;
-        GV->replaceAllUsesWith(ConstantExpr::getCast(OldGV, GV->getType()));
+        GV->replaceAllUsesWith(ConstantExpr::getBitCast(OldGV, GV->getType()));
         GV->eraseFromParent();
         Changed = true;
       }
