From 7e3b54f82621e505437a84b7f815b609f79c52f1 Mon Sep 17 00:00:00 2001
From: jackcmay <jack@solana.com>
Date: Fri, 21 Dec 2018 08:49:29 -0800
Subject: [PATCH] Remove llc step when building BPF C programs (#2254)

---
 sdk/bpf/bpf.mk | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/sdk/bpf/bpf.mk b/sdk/bpf/bpf.mk
index c56ddd15af..a66ef23635 100644
--- a/sdk/bpf/bpf.mk
+++ b/sdk/bpf/bpf.mk
@@ -26,7 +26,6 @@ endif
 ifdef LLVM_DIR
 CC := $(LLVM_DIR)/bin/clang
 CXX := $(LLVM_DIR)/bin/clang++
-LLC := $(LLVM_DIR)/bin/llc
 LLD := $(LLVM_DIR)/bin/ld.lld
 OBJ_DUMP := $(LLVM_DIR)/bin/llvm-objdump
 endif
@@ -49,15 +48,11 @@ CXX_FLAGS := \
 
 BPF_C_FLAGS := \
   $(C_FLAGS) \
-  -S \
-  -emit-llvm \
   -target bpf \
   -fPIC \
 
 BPF_CXX_FLAGS := \
   $(CXX_FLAGS) \
-  -S \
-  -emit-llvm \
   -target bpf \
   -fPIC \
   -fomit-frame-pointer \
@@ -65,10 +60,6 @@ BPF_CXX_FLAGS := \
   -fno-asynchronous-unwind-tables \
   -fno-unwind-tables \
 
-BPF_LLC_FLAGS := \
-  -march=bpf \
-  -filetype=obj \
-
 BPF_LLD_FLAGS := \
   -z notext \
   -shared \
@@ -158,21 +149,16 @@ help:
 $(INSTALL_SH):
 	$(INSTALL_SH)
 
-.PRECIOUS: $(OUT_DIR)/%.ll
-$(OUT_DIR)/%.ll: $(SRC_DIR)/%.c $(INSTALL_SH)
+.PRECIOUS: $(OUT_DIR)/%.o
+$(OUT_DIR)/%.o: $(SRC_DIR)/%.c $(INSTALL_SH)
 	@echo "[cc] $@ ($<)"
 	$(_@)mkdir -p $(OUT_DIR)
-	$(_@)$(CC) $(BPF_C_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d)
+	$(_@)$(CC) $(BPF_C_FLAGS) -o $@ -c $< -MD -MF $(@:.o=.d)
 
-$(OUT_DIR)/%.ll: $(SRC_DIR)/%.cc $(INSTALL_SH)
+$(OUT_DIR)/%.o: $(SRC_DIR)/%.cc $(INSTALL_SH)
 	@echo "[cxx] $@ ($<)"
 	$(_@)mkdir -p $(OUT_DIR)
-	$(_@)$(CXX) $(BPF_CXX_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d)
-
-.PRECIOUS: $(OUT_DIR)/%.o
-$(OUT_DIR)/%.o: $(OUT_DIR)/%.ll $(INSTALL_SH)
-	@echo "[llc] $@ ($<)"
-	$(_@)$(LLC) $(BPF_LLC_FLAGS) -o $@ $<
+	$(_@)$(CXX) $(BPF_CXX_FLAGS) -o $@ -c $< -MD -MF $(@:.o=.d)
 
 .PRECIOUS: $(OUT_DIR)/%.so
 $(OUT_DIR)/%.so: $(OUT_DIR)/%.o $(INSTALL_SH)