Skip to content

Commit 78987bb

Browse files
MaskRaynamhyung
authored andcommitted
perf: Replace deprecated -target with --target= for Clang
-target has been deprecated since Clang 3.4 in 2013. Use the preferred --target=bpf form instead. This matches how we use --target= in scripts/Makefile.clang. Signed-off-by: Fangrui Song <[email protected]> Acked-by: Yonghong Song <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: [email protected] Cc: Ingo Molnar <[email protected]> Cc: [email protected] Link: llvm/llvm-project@274b6f0 Link: https://lore.kernel.org/r/[email protected] [ resolved a conflict with GEN_VMLINUX_H changes ] Signed-off-by: Namhyung Kim <[email protected]>
1 parent 710dffc commit 78987bb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tools/perf/Documentation/perf-config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ llvm.*::
669669
"$CLANG_OPTIONS $PERF_BPF_INC_OPTIONS $KERNEL_INC_OPTIONS " \
670670
"-Wno-unused-value -Wno-pointer-sign " \
671671
"-working-directory $WORKING_DIR " \
672-
"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -O2 -o - $LLVM_OPTIONS_PIPE"
672+
"-c \"$CLANG_SOURCE\" --target=bpf $CLANG_EMIT_LLVM -O2 -o - $LLVM_OPTIONS_PIPE"
673673

674674
llvm.clang-opt::
675675
Options passed to clang.

tools/perf/Makefile.perf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ $(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBSUBCMD_
10641064
ifdef BUILD_BPF_SKEL
10651065
BPFTOOL := $(SKEL_TMP_OUT)/bootstrap/bpftool
10661066
# Get Clang's default includes on this system, as opposed to those seen by
1067-
# '-target bpf'. This fixes "missing" files on some architectures/distros,
1067+
# '--target=bpf'. This fixes "missing" files on some architectures/distros,
10681068
# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc.
10691069
#
10701070
# Use '-idirafter': Don't interfere with include mechanics except where the
@@ -1124,7 +1124,7 @@ else
11241124
endif
11251125

11261126
$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT)
1127-
$(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \
1127+
$(QUIET_CLANG)$(CLANG) -g -O2 --target=bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \
11281128
-c $(filter util/bpf_skel/%.bpf.c,$^) -o $@
11291129

11301130
$(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o | $(BPFTOOL)

tools/perf/util/llvm-utils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"$CLANG_OPTIONS $PERF_BPF_INC_OPTIONS $KERNEL_INC_OPTIONS " \
2626
"-Wno-unused-value -Wno-pointer-sign " \
2727
"-working-directory $WORKING_DIR " \
28-
"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -g -O2 -o - $LLVM_OPTIONS_PIPE"
28+
"-c \"$CLANG_SOURCE\" --target=bpf $CLANG_EMIT_LLVM -g -O2 -o - $LLVM_OPTIONS_PIPE"
2929

3030
struct llvm_param llvm_param = {
3131
.clang_path = "clang",
@@ -569,7 +569,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
569569
pr_err("ERROR:\tunable to compile %s\n", path);
570570
pr_err("Hint:\tCheck error message shown above.\n");
571571
pr_err("Hint:\tYou can also pre-compile it into .o using:\n");
572-
pr_err(" \t\tclang -target bpf -O2 -c %s\n", path);
572+
pr_err(" \t\tclang --target=bpf -O2 -c %s\n", path);
573573
pr_err(" \twith proper -I and -D options.\n");
574574
goto errout;
575575
}

0 commit comments

Comments
 (0)