From d787114a9f3dda1194aaf6cd623fa08eadf75b85 Mon Sep 17 00:00:00 2001
From: gamemann <gamemann@gflclan.com>
Date: Fri, 12 Nov 2021 20:30:34 +0000
Subject: [PATCH] Use Clang to compile BPF object/program.

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a6a510b..3f4c5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 CC = clang
+ARCH := $(shell uname -m | sed 's/x86_64/x86/')
 
 BUILDDIR = build
 SRCDIR = src
@@ -20,7 +21,6 @@ XDPFWSRC = xdpfw.c
 XDPFWOUT = xdpfw
 
 XDPPROGSRC = xdpfw_kern.c
-XDPPROGBC = xdpfw_kern.bc
 XDPPROGOBJ = xdpfw_kern.o
 
 OBJS = $(BUILDDIR)/$(CONFIGOBJ) $(BUILDDIR)/$(CMDLINEOBJ)
@@ -34,8 +34,7 @@ xdpfw: utils libbpf $(OBJS)
 	$(CC) $(LDFLAGS) $(INCS) -o $(BUILDDIR)/$(XDPFWOUT) $(LIBBPFOBJS) $(OBJS) $(SRCDIR)/$(XDPFWSRC)
 xdpfw_filter:
 	mkdir -p $(BUILDDIR)/
-	$(CC) $(INCS) -D__BPF__ -Wall -Wextra -O2 -emit-llvm -c -o $(BUILDDIR)/$(XDPPROGBC) $(SRCDIR)/$(XDPPROGSRC)
-	llc -march=bpf -filetype=obj -o $(BUILDDIR)/$(XDPPROGOBJ) $(BUILDDIR)/$(XDPPROGBC)
+	$(CC) $(INCS) -D__BPF__ -O2 -target bpf -D__TARGET_ARCH_$(ARCH) -c -o $(BUILDDIR)/$(XDPPROGOBJ) $(SRCDIR)/$(XDPPROGSRC)
 utils:
 	mkdir -p $(BUILDDIR)/
 	$(CC) -O2 -c -o $(BUILDDIR)/$(CONFIGOBJ) $(SRCDIR)/$(CONFIGSRC)