diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index 493e7ec..74ed208 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -1157,6 +1157,8 @@
             case Intrinsic::va_start:
             case Intrinsic::va_copy:
             case Intrinsic::va_end:
+            case Intrinsic::returnaddress:
+            case Intrinsic::frameaddress:
               // We directly implement these intrinsics
               break;
             default:
@@ -1205,6 +1207,16 @@
         writeOperand(I.getOperand(1));
         Out << ")";
         return;
+      case Intrinsic::returnaddress:
+        Out << "__builtin_return_address(";
+        writeOperand(I.getOperand(1));
+        Out << ")";
+        return;
+      case Intrinsic::frameaddress:
+        Out << "__builtin_frame_address(";
+        writeOperand(I.getOperand(1));
+        Out << ")";
+        return;
       }
     }
   visitCallSite(&I);
diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index 493e7ec..74ed208 100644
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -1157,6 +1157,8 @@
             case Intrinsic::va_start:
             case Intrinsic::va_copy:
             case Intrinsic::va_end:
+            case Intrinsic::returnaddress:
+            case Intrinsic::frameaddress:
               // We directly implement these intrinsics
               break;
             default:
@@ -1205,6 +1207,16 @@
         writeOperand(I.getOperand(1));
         Out << ")";
         return;
+      case Intrinsic::returnaddress:
+        Out << "__builtin_return_address(";
+        writeOperand(I.getOperand(1));
+        Out << ")";
+        return;
+      case Intrinsic::frameaddress:
+        Out << "__builtin_frame_address(";
+        writeOperand(I.getOperand(1));
+        Out << ")";
+        return;
       }
     }
   visitCallSite(&I);