From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 122680 invoked by alias); 3 Jul 2019 20:04:20 -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 122666 invoked by uid 89); 3 Jul 2019 20:04:20 -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, omar, Omar, H*i:sk:cover.1 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-pg1-f193.google.com Received: from mail-pg1-f193.google.com (HELO mail-pg1-f193.google.com) (209.85.215.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 Jul 2019 20:04:18 +0000 Received: by mail-pg1-f193.google.com with SMTP id i8so1736755pgm.13 for ; Wed, 03 Jul 2019 13:04:18 -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=OKF1ZGEd3IozjrmKKahlNhmd20izcKm/HgMKtwtbj3g=; b=Tvcr5pjizGyQk+1ijgBklkJbEmJJ7AeIOk3D/KGhd5pDa8WmIRAoxKVFCdXZqQ0CxA yiERj2RgEzpeRyAsXp9DwAa7kLJI33e2Y2/iiOGjpmUGSPR/nWKcIC+YRu8Yoo1tnf3c RJyLgSSVOh8Gvkr56monBu8x4Hlr24O2Xe9sjuAHWHWMXa+MbAcTQuWWGANtuUMRnkjW VBYlwh9Ss8DYaueiysxaMqEqYjgy5+35Y/5mziYjVTD1s5vVxeeAvTMa0RVH1YNOJ5J7 Azh5U7bcmvmfsvtOWQ84bZXekjfo8mbQVjjAQgSCgBBeKCnUs9nigVYKLKWnB+oYmDSp GOCg== 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=OKF1ZGEd3IozjrmKKahlNhmd20izcKm/HgMKtwtbj3g=; b=mcL1ET+0IhDU2nbcx9z+O/Cjyha8wBXe/K4RfhiLroXHKmsvC3ZHiPhVplPBNojgHe AuZd9zS4cjitdlXOPOt90MeG8tG8GVQyX3KIKIVTwNtCjshZDs6ndS9jSjr+t8O26M4a HU8sVaC7cqThjG3rOrN+UUjxcvcymk/68xywTVFUJ0bQxn8jUl1VGRgEu0hZsnhTmiEx F35V2Pp3jVgPy8Uvs3NRQcts7wf2MgDFzFUN01KTdbtz8cESx0uDSss0xjU4WiJ8nk7P xpmpSgy8CrOxctE8U76SwGl2EnNQLRa6KBBDTBOUURUU8ajDL0X/BW/YO57sfzqZZtwc RKCA== X-Gm-Message-State: APjAAAWHujw+aYq1vMnXMUPF8ftFmjl1YTkA/c19FiohKZ6ARkQ/v1+E houHg6FrL0O8z3j2Tfr8DjYgQPWkfnc= X-Google-Smtp-Source: APXvYqyaddJiORKFxEBULlaEcEQkSKiU1RBPp01n96qdgEywHApRvV09cwgQaawus8WfG8/0WwZamQ== X-Received: by 2002:a17:90a:9905:: with SMTP id b5mr15117922pjp.70.1562184256715; Wed, 03 Jul 2019 13:04:16 -0700 (PDT) Received: from vader.hsd1.wa.comcast.net ([2601:602:8b00:55d3:e6a7:a0ff:fe0b:c9a8]) by smtp.gmail.com with ESMTPSA id b3sm5493286pfp.65.2019.07.03.13.04.16 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 03 Jul 2019 13:04:16 -0700 (PDT) From: Omar Sandoval To: elfutils-devel@sourceware.org Subject: [RFC PATCH 1/2] libcpu: merge libcpu_{i386,x86_64,bpf} into one library Date: Wed, 03 Jul 2019 20:04:00 -0000 Message-Id: X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2019-q3/txt/msg00009.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 6c2b47a9..b40a4c8e 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2019-07-02 Omar Sandoval + + * Makefile.am: Use combined libcpu.a library. + 2019-04-14 Mark Wielaard * riscv_cfi.c: Fix BACKEND define. diff --git a/backends/Makefile.am b/backends/Makefile.am index 2126a2ec..0307da07 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -43,6 +43,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 @@ -50,7 +51,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) @@ -61,7 +61,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) @@ -127,7 +126,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) @@ -137,20 +135,16 @@ libebl_riscv_pic_a_SOURCES = $(riscv_SRCS) am_libebl_riscv_pic_a_OBJECTS = $(riscv_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..0075a793 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2019-07-02 Omar Sandoval + + * Makefile.am: Combine backends 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.22.0