From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 44068 invoked by alias); 26 Aug 2019 17:51:57 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 43771 invoked by uid 89); 26 Aug 2019 17:51:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=T, preparation, HX-Spam-Relays-External:209.85.214.195, H*RU:209.85.214.195 X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mail-pl1-f195.google.com Received: from mail-pl1-f195.google.com (HELO mail-pl1-f195.google.com) (209.85.214.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Aug 2019 17:51:55 +0000 Received: by mail-pl1-f195.google.com with SMTP id y8so10397451plr.12 for ; Mon, 26 Aug 2019 10:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ejyLP2FNuhEuaP4bac7a1vhQwmM7W0mBRXjeGdfeRHQ=; b=oqoQt5ai29VP9gqLt9zciESVSv7E8y5Xgkjs0kN0JEvNjry8xLrsHhmHQKCaQy9mHi eQXPjUIxnixNJpK0bNrfawxEobMTubtenJuAIFe72nZ8vlHPuftm2rM578PVePCmDstB +hhiVI2ruygHax4E7lkoAkBowjbQNIjgW6Fe+1+XNGJNmpVK1++z8ocSygjHfhKuGiuZ YNU8syHwgZe0LbeS/Xd4In3YVRgdNzpagOxd/xaK9nQrdisoWv7sixW66gxr4bdd7LTQ krHrlnjGBA5pPtZIDdHrjDhjAc7aaIqSPpRLt1mWsS48NO/+aHzg/OjHlSY7JGeUs1Hb GJjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ejyLP2FNuhEuaP4bac7a1vhQwmM7W0mBRXjeGdfeRHQ=; b=UnmkGdleSUX07T5hw8RfkvQn1dE2ihhrgJAyJ/P0s9Oh34tRxzVA6HBoOXp8U7Ko+6 lXfEcNiO9n5/x1uhJCO1bOrHyauWmSg9hCuDoIIflTvmDwPqp5JuJZ6PeyZsrXTlrh24 IpLkn10RsA+aH6ScI2SgHd7GLgK7C/bm864L6m21+tbxEo0USalU1tPYv1ceXYoTyyjv Au3qy+HN56FSby95oogppiX0yCZfoWpxS4SFFHF4hyVR1Z7Il1rYGO1il0NM4152FOeQ 0xhkY8LXPTWxthUO0w1zxgSoIUCMvWj73m0OfmRCgrAFqUm4o1xARLnUcz/dQqRUW9mb mdEg== X-Gm-Message-State: APjAAAV1/eJ9RdNbRxJ5+iQtfX3KTFnZ3hrSxlLqQP6YENPoB6aN/5SC 1bKwJ7ieTyJZ9liIBIteGPTwB9HjgdI= X-Google-Smtp-Source: APXvYqwQSXb1rUlBqVAMQD4c6QYg4pnCghMcH2VlV5VKPo8O3lVGLbH56uR5Owot//PUG5TLYpuf3Q== X-Received: by 2002:a17:902:b604:: with SMTP id b4mr19635110pls.94.1566841913630; Mon, 26 Aug 2019 10:51:53 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::a7c3]) by smtp.gmail.com with ESMTPSA id a1sm16240472pfl.53.2019.08.26.10.51.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 10:51:53 -0700 (PDT) From: Omar Sandoval To: elfutils-devel@sourceware.org Subject: [PATCH v2 2/4] libcpu: merge libcpu_{i386,x86_64,bpf} into one library Date: Mon, 26 Aug 2019 17:51:00 -0000 Message-Id: <01b3f5b47cc8ccaa5e56fed7bd202188201796da.1566841692.git.osandov@fb.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2019-q3/txt/msg00141.txt.bz2 From: Omar Sandoval In preparation for combining the libebl backend modules, combine all of the libcpu backends into libcpu.a. Signed-off-by: Omar Sandoval --- backends/ChangeLog | 4 ++++ backends/Makefile.am | 12 +++--------- libcpu/ChangeLog | 4 ++++ libcpu/Makefile.am | 12 +++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/backends/ChangeLog b/backends/ChangeLog index f1eaf14b..91790bb9 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2019-07-05 Omar Sandoval + + * Makefile.am: Replace libcpu_{i386,x86_64,bpf}.a with libcpu.a. + 2019-07-13 Mao Han * Makefile.am: Add C-SKY. diff --git a/backends/Makefile.am b/backends/Makefile.am index 175468f6..6470a313 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -44,6 +44,7 @@ noinst_LIBRARIES = $(libebl_pic) noinst_DATA = $(libebl_pic:_pic.a=.so) +libcpu = ../libcpu/libcpu.a libelf = ../libelf/libelf.so libdw = ../libdw/libdw.so libeu = ../lib/libeu.a @@ -51,7 +52,6 @@ libeu = ../lib/libeu.a i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \ i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \ i386_initreg.c i386_unwind.c -cpu_i386 = ../libcpu/libcpu_i386.a libebl_i386_pic_a_SOURCES = $(i386_SRCS) am_libebl_i386_pic_a_OBJECTS = $(i386_SRCS:.c=.os) @@ -62,7 +62,6 @@ am_libebl_sh_pic_a_OBJECTS = $(sh_SRCS:.c=.os) x86_64_SRCS = x86_64_init.c x86_64_symbol.c x86_64_corenote.c x86_64_cfi.c \ x86_64_retval.c x86_64_regs.c i386_auxv.c x86_64_syscall.c \ x86_64_initreg.c x86_64_unwind.c x32_corenote.c -cpu_x86_64 = ../libcpu/libcpu_x86_64.a libebl_x86_64_pic_a_SOURCES = $(x86_64_SRCS) am_libebl_x86_64_pic_a_OBJECTS = $(x86_64_SRCS:.c=.os) @@ -128,7 +127,6 @@ am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os) m68k_corenote_no_Wpacked_not_aligned = yes bpf_SRCS = bpf_init.c bpf_regs.c bpf_symbol.c -cpu_bpf = ../libcpu/libcpu_bpf.a libebl_bpf_pic_a_SOURCES = $(bpf_SRCS) am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os) @@ -142,20 +140,16 @@ csky_SRCS = csky_attrs.c csky_init.c csky_symbol.c csky_cfi.c \ libebl_csky_pic_a_SOURCES = $(csky_SRCS) am_libebl_csky_pic_a_OBJECTS = $(csky_SRCS:.c=.os) -libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) +libebl_%.so libebl_%.map: libebl_%_pic.a $(libcpu) $(libelf) $(libdw) $(libeu) @rm -f $(@:.so=.map) $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \ > $(@:.so=.map) $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $(@:.map=.so) \ - -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--whole-archive $< $(libcpu) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map),--no-undefined \ -Wl,--as-needed $(libelf) $(libdw) $(libeu) @$(textrel_check) -libebl_i386.so: $(cpu_i386) -libebl_x86_64.so: $(cpu_x86_64) -libebl_bpf.so: $(cpu_bpf) - install: install-am install-ebl-modules install-ebl-modules: $(mkinstalldirs) $(DESTDIR)$(libdir)/$(LIBEBL_SUBDIR) diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index adebbef8..c0ea72ec 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2019-07-05 Omar Sandoval + + * Makefile.am: Combine libcpu_{i386,x86_64,bpf}.a into libcpu.a. + 2018-11-04 Mark Wielaard * bpf_disasm.c (bpf_disasm): Recognize BPF_JLT, BPF_JLE, BPF_JSLT diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 4c8778d1..a7d9f6fd 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -35,20 +35,16 @@ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$( $@T $(AM_V_at)mv -f $@T $@ @@ -86,6 +82,8 @@ i386_gendis_LDADD = $(libeu) -lm i386_parse.h: i386_parse.c ; +bpf_disasm_CFLAGS = -Wno-format-nonliteral + EXTRA_DIST = defs/i386 CLEANFILES += $(foreach P,i386 x86_64,$P_defs $P.mnemonics) -- 2.23.0