[v7,perf,bpf,11/15] perf: add -lopcodes to feature-libbfd
diff mbox series

Message ID 20190307175810.249857-12-songliubraving@fb.com
State Changes Requested
Delegated to: BPF Maintainers
Headers show
Series
  • perf annotation of BPF programs
Related show

Commit Message

Song Liu March 7, 2019, 5:58 p.m. UTC
Both libbfd and libopcodes are distributed with binutil-dev/devel. When
libbfd presents, it is OK to assume libopcodes also presents. This has
been a safe assumption for bpftool.

This patch adds -lopcodes to perf/Makefile.config. libopcodes will be
used in the next commit for bpf annotation.

Signed-off-by: Song Liu <songliubraving@fb.com>
---
 tools/perf/Makefile.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stanislav Fomichev March 7, 2019, 11:26 p.m. UTC | #1
On 03/07, Song Liu wrote:
> Both libbfd and libopcodes are distributed with binutil-dev/devel. When
> libbfd presents, it is OK to assume libopcodes also presents. This has
> been a safe assumption for bpftool.
> 
> This patch adds -lopcodes to perf/Makefile.config. libopcodes will be
> used in the next commit for bpf annotation.
> 
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>  tools/perf/Makefile.config | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index b441c88cafa1..e0bafbc273af 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -701,7 +701,7 @@ else
>  endif
>  
>  ifeq ($(feature-libbfd), 1)
> -  EXTLIBS += -lbfd
> +  EXTLIBS += -lbfd -lopcodes
I think you need to add -lopcodes to the other feature checks as
well (to work on the systems which require -liberty and/or -lz for
libfd):

--

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index b441c88cafa1..3fa2f5d7d54f 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -701,7 +701,7 @@ else
 endif
 
 ifeq ($(feature-libbfd), 1)
-  EXTLIBS += -lbfd
+  EXTLIBS += -lbfd -lopcodes
 else
   # we are on a system that requires -liberty and (maybe) -lz
   # to link against -lbfd; test each case individually here
@@ -712,10 +712,10 @@ else
   $(call feature_check,libbfd-liberty-z)
 
   ifeq ($(feature-libbfd-liberty), 1)
-    EXTLIBS += -lbfd -liberty
+    EXTLIBS += -lbfd -lopcodes -liberty
   else
     ifeq ($(feature-libbfd-liberty-z), 1)
-      EXTLIBS += -lbfd -liberty -lz
+      EXTLIBS += -lbfd -lopcodes -liberty -lz
     endif
   endif
 endif

>  else
>    # we are on a system that requires -liberty and (maybe) -lz
>    # to link against -lbfd; test each case individually here
> -- 
> 2.17.1
>
Song Liu March 7, 2019, 11:47 p.m. UTC | #2
> On Mar 7, 2019, at 3:26 PM, Stanislav Fomichev <sdf@fomichev.me> wrote:
> 
> On 03/07, Song Liu wrote:
>> Both libbfd and libopcodes are distributed with binutil-dev/devel. When
>> libbfd presents, it is OK to assume libopcodes also presents. This has
>> been a safe assumption for bpftool.
>> 
>> This patch adds -lopcodes to perf/Makefile.config. libopcodes will be
>> used in the next commit for bpf annotation.
>> 
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>> tools/perf/Makefile.config | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
>> index b441c88cafa1..e0bafbc273af 100644
>> --- a/tools/perf/Makefile.config
>> +++ b/tools/perf/Makefile.config
>> @@ -701,7 +701,7 @@ else
>> endif
>> 
>> ifeq ($(feature-libbfd), 1)
>> -  EXTLIBS += -lbfd
>> +  EXTLIBS += -lbfd -lopcodes
> I think you need to add -lopcodes to the other feature checks as
> well (to work on the systems which require -liberty and/or -lz for
> libfd):
> 
> --
> 
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index b441c88cafa1..3fa2f5d7d54f 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -701,7 +701,7 @@ else
> endif
> 
> ifeq ($(feature-libbfd), 1)
> -  EXTLIBS += -lbfd
> +  EXTLIBS += -lbfd -lopcodes
> else
>   # we are on a system that requires -liberty and (maybe) -lz
>   # to link against -lbfd; test each case individually here
> @@ -712,10 +712,10 @@ else
>   $(call feature_check,libbfd-liberty-z)
> 
>   ifeq ($(feature-libbfd-liberty), 1)
> -    EXTLIBS += -lbfd -liberty
> +    EXTLIBS += -lbfd -lopcodes -liberty
>   else
>     ifeq ($(feature-libbfd-liberty-z), 1)
> -      EXTLIBS += -lbfd -liberty -lz
> +      EXTLIBS += -lbfd -lopcodes -liberty -lz
>     endif
>   endif
> endif

Good point! I will fix it in next version. 

Thanks,
Song

> 
>> else
>>   # we are on a system that requires -liberty and (maybe) -lz
>>   # to link against -lbfd; test each case individually here
>> -- 
>> 2.17.1

Patch
diff mbox series

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index b441c88cafa1..e0bafbc273af 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -701,7 +701,7 @@  else
 endif
 
 ifeq ($(feature-libbfd), 1)
-  EXTLIBS += -lbfd
+  EXTLIBS += -lbfd -lopcodes
 else
   # we are on a system that requires -liberty and (maybe) -lz
   # to link against -lbfd; test each case individually here