From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbcGRVhG (ORCPT ); Mon, 18 Jul 2016 17:37:06 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33197 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbcGRVhF (ORCPT ); Mon, 18 Jul 2016 17:37:05 -0400 Date: Mon, 18 Jul 2016 14:37:00 -0700 From: Alexei Starovoitov To: Wang Nan Cc: acme@kernel.org, lizefan@huawei.com, linux-kernel@vger.kernel.org, pi3orama@163.com, Alexei Starovoitov , Arnaldo Carvalho de Melo , Daniel Borkmann Subject: Re: [PATCH] tools lib bpf: Use official ELF e_machine value Message-ID: <20160718213658.GA44350@ast-mbp.thefacebook.com> References: <1468821668-60088-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468821668-60088-1-git-send-email-wangnan0@huawei.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 18, 2016 at 06:01:08AM +0000, Wang Nan wrote: > New LLVM will issue newly assigned EM_BPF machine code. The new code > will be propogated to glibc and libelf. > > This patch introduces the new machine code to libbpf. > > Signed-off-by: Wang Nan > Cc: Alexei Starovoitov > Cc: Arnaldo Carvalho de Melo > Cc: Zefan Li > Cc: pi3orama@163.com > --- > tools/lib/bpf/libbpf.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index 32e6b6b..b699aea 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -37,6 +37,10 @@ > #include "libbpf.h" > #include "bpf.h" > > +#ifndef EM_BPF > +#define EM_BPF 247 > +#endif > + > #define __printf(a, b) __attribute__((format(printf, a, b))) > > __printf(1, 2) > @@ -439,7 +443,8 @@ static int bpf_object__elf_init(struct bpf_object *obj) > } > ep = &obj->efile.ehdr; > > - if ((ep->e_type != ET_REL) || (ep->e_machine != 0)) { > + /* Old LLVM set e_machine to EM_NONE */ > + if ((ep->e_type != ET_REL) || (ep->e_machine && (ep->e_machine != EM_BPF))) { Thanks for the fix. Didn't realize we already check for zero here. btw EM_BPF will be in llvm 3.9 release. Acked-by: Alexei Starovoitov