From ad36ddedf11b27ce1e597a02031afadc2f555e34 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 25 Aug 2020 11:02:06 +0000
Subject: [PATCH] CPI support for bpf_loader_deprecated (bp #11695) (#11824)

* CPI support for bpf_loader_deprecated (#11695)

(cherry picked from commit 46830124f8b98c72ff58e6e1c723fb1cbdb75e4e)

# Conflicts:
#	programs/bpf_loader/src/syscalls.rs

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
---
 programs/bpf_loader/src/syscalls.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs
index ccfc1a9498d115..7fa47cb6144e51 100644
--- a/programs/bpf_loader/src/syscalls.rs
+++ b/programs/bpf_loader/src/syscalls.rs
@@ -10,7 +10,7 @@ use solana_sdk::{
     account::Account,
     account::KeyedAccount,
     account_info::AccountInfo,
-    bpf_loader,
+    bpf_loader, bpf_loader_deprecated,
     entrypoint::SUCCESS,
     entrypoint_native::{ComputeMeter, InvokeContext, Logger},
     instruction::{AccountMeta, Instruction, InstructionError},
@@ -886,6 +886,7 @@ fn call<'a>(
         message_processor.add_program(*program_id, *process_instruction);
     }
     message_processor.add_loader(bpf_loader::id(), crate::process_instruction);
+    message_processor.add_loader(bpf_loader_deprecated::id(), crate::process_instruction);
     message_processor.set_cross_program_support(invoke_context.is_cross_program_supported());
 
     #[allow(clippy::deref_addrof)]