Skip to contentSkip to conversation

bpftool: Allow to add compiler flags via EXTRA_CFLAGS variable

PATCH In review Jiri Olsa 3 participants 5 messages Oct 8, 2018 – Oct 11, 2018

Subsystems (4)
Networking Network drivers BPF bpftool
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/2 bpftool: Allow to add compiler flags via EXTRA_CFLAGS variable

Adding EXTRA_CFLAGS allowing user to specify extra flags for CFLAGS variable.

Signed-off-by Jiri Olsa <[email protected]>
---
 tools/bpf/bpftool/Makefile | 4 ++++
 1 file changed, 4 insertions(+)
tools/bpf/bpftool/Makefile +4 -0
index 74288a2197ab..5bfa07e3f2f7 100644
@@ -46,6 +46,10 @@ CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
 	-I$(srctree)/tools/lib/bpf \
 	-I$(srctree)/tools/perf
 CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
+ifneq ($(EXTRA_CFLAGS),)
+CFLAGS += $(EXTRA_CFLAGS)
+endif
+
 LIBS = -lelf -lbfd -lopcodes $(LIBBPF)
 
 INSTALL ?= install
Signature · 1 line
2.17.2
author reviewer
#1 lore raw

PATCH 2/2 bpftool: Allow add linker flags via EXTRA_LDFLAGS variable

Adding EXTRA_LDFLAGS allowing user to specify extra flags for LD_FLAGS variable. Also adding LDFLAGS to build command line.

Signed-off-by Jiri Olsa <[email protected]>
---
 tools/bpf/bpftool/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/bpf/bpftool/Makefile +4 -1
index 5bfa07e3f2f7..dac7eff4c7e5 100644
@@ -49,6 +49,9 @@ CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
 ifneq ($(EXTRA_CFLAGS),)
 CFLAGS += $(EXTRA_CFLAGS)
 endif
+ifneq ($(EXTRA_LDFLAGS),)
+LDFLAGS += $(EXTRA_LDFLAGS)
+endif
 
 LIBS = -lelf -lbfd -lopcodes $(LIBBPF)
 

@@ -94,7 +97,7 @@ $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
 	$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
 
 $(OUTPUT)bpftool: $(OBJS) $(LIBBPF)
-	$(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 $(OUTPUT)%.o: %.c
 	$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
Signature · 1 line
2.17.2
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] bpftool: Allow add linker flags via EXTRA_LDFLAGS variable

Quoted 6 lines · Jiri Olsa

Adding EXTRA_LDFLAGS allowing user to specify extra flags for LD_FLAGS variable. Also adding LDFLAGS to build command line.

Signed-off-by Jiri Olsa <[email protected]>
Acked-by Song Liu <[email protected]>
Quoted 30 lines
---
 tools/bpf/bpftool/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/bpf/bpftool/Makefile +4 -2
index 5bfa07e3f2f7..dac7eff4c7e5 100644
@@ -49,6 +49,9 @@ CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
 ifneq ($(EXTRA_CFLAGS),)
 CFLAGS += $(EXTRA_CFLAGS)
 endif
+ifneq ($(EXTRA_LDFLAGS),)
+LDFLAGS += $(EXTRA_LDFLAGS)
+endif
 
 LIBS = -lelf -lbfd -lopcodes $(LIBBPF)
 

@@ -94,7 +97,7 @@ $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
        $(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
 
 $(OUTPUT)bpftool: $(OBJS) $(LIBBPF)
-       $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+       $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 $(OUTPUT)%.o: %.c
        $(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
--

2.17.2

Acked-by on v1 1/2
#3 lore raw
In reply to Jiri Olsa
Quoted 5 lines · Jiri Olsa

Adding EXTRA_CFLAGS allowing user to specify extra flags for CFLAGS variable.

Signed-off-by Jiri Olsa <[email protected]>
Acked-by Song Liu <[email protected]>
Quoted 22 lines
---
 tools/bpf/bpftool/Makefile | 4 ++++
 1 file changed, 4 insertions(+)
tools/bpf/bpftool/Makefile +4 -1
index 74288a2197ab..5bfa07e3f2f7 100644
@@ -46,6 +46,10 @@ CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
        -I$(srctree)/tools/lib/bpf \
        -I$(srctree)/tools/perf
 CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
+ifneq ($(EXTRA_CFLAGS),)
+CFLAGS += $(EXTRA_CFLAGS)
+endif
+
 LIBS = -lelf -lbfd -lopcodes $(LIBBPF)
 
 INSTALL ?= install
--

2.17.2