From patchwork Wed Apr 21 21:26:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4195 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FQYX91SfDz44R5 for ; Wed, 21 Apr 2021 21:26:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FQYX81SlMznC; Wed, 21 Apr 2021 21:26:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FQYX76rZ1z2xt7; Wed, 21 Apr 2021 21:26:31 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FQYX61gXqz2xt7 for ; Wed, 21 Apr 2021 21:26:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FQYX52T5zzZN; Wed, 21 Apr 2021 21:26:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619040389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ndlNo4O7ASt9jcqiueQxbHXR4YLx12Idad0IRcMARn0=; b=Q/CTc72tbX3CefKlJu4HVOLu+7FGv8K9Uc5SpPnMnwjBfiLncDxEE4OZiGPWdPEji8s8Hb vaER61zGhFAb++CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619040389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ndlNo4O7ASt9jcqiueQxbHXR4YLx12Idad0IRcMARn0=; b=XOtyZiDvisDdippz4GKQa/64K1YWFDgFoxYUuxUilD+Da/2qWDVf8UPuHP4Ena6IgMItVF GqbF2rIcJCFYOhtJRQ3Smi+2ezyFAFGBIg+uBuADBWl99Klum+NU1P+b+WaEXXqGa082ad 0vlyNjQ0LRyreebkw0JwukmhWama7O6Zil/yOVW/nmhi4/eedB4peK/G3ah891Mq4VYaKy 8muw6DZy7qC3ByGsyHWFn6GnBVJzFlhOvzBoj7qfN7uX4N6GU2ItmJGSrlGCQfSV67YDea 4dHYG8MNBfv2Mj1lE/P1mhm84wV84ZsVTUjRvd84bOKGbRDobYN7hP+Juoj9Tg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/4] binutils: Update to 2.36.1 Date: Wed, 21 Apr 2021 23:26:23 +0200 Message-Id: <20210421212626.2729436-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 2.35.1 to 2.36.1 - Update of rootfiles for each architecture - Changelog 2021-01-26 Nick Alcock * Makefile.def: Add install-libctf dependency to install-ld. * Makefile.in: Regenerated. 2021-01-09 Nick Clifton * 2.36 release branch crated. 2021-01-07 Samuel Thibault * libtool.m4: Match gnu* along with other GNU systems. 2021-01-07 Alan Modra * config.sub: Accept OS of eabi* and gnueabi*. 2021-01-05 Nick Alcock * Makefile.def (libctf): No longer no_check. Checking depends on all-ld. * Makefile.in: Regenerated. 2021-01-05 Nick Clifton * libiberty: Sync with gcc. Bring in: 2021-01-04 Martin Liska * strverscmp.c: Convert to utf8 from iso8859. 2020-12-22 Jason Merrill PR c++/67343 * cp-demangle.h (struct d_info): Add unresolved_name_state. * cp-demangle.c (d_prefix): Add subst parm. (d_nested_name): Pass it. (d_unresolved_name): Split out from... (d_expression_1): ...here. (d_demangle_callback): Maybe retry with old sr mangling. * testsuite/demangle-expected: Add test. 2020-12-21 Jason Merrill * cp-demangle.c (d_expression_1): Recognize qualified-id on RHS of dt/pt. * testsuite/demangle-expected: Add test. 2020-12-21 Jason Merrill * cp-demangle.c (d_unqualified_name): Clear is_expression. * testsuite/demangle-expected: Add tests. 2020-11-25 Matthew Malcomson * configure: Regenerate. * configure.ac: Avoid using sanitizer. 2020-11-13 Eduard-Mihai Burtescu * rust-demangle.c (struct rust_demangler): Add skipping_printing and bound_lifetime_depth fields. (eat): Add (v0-only). (parse_integer_62): Add (v0-only). (parse_opt_integer_62): Add (v0-only). (parse_disambiguator): Add (v0-only). (struct rust_mangled_ident): Add punycode{,_len} fields. (parse_ident): Support v0 identifiers. (print_str): Respect skipping_printing. (print_uint64): Add (v0-only). (print_uint64_hex): Add (v0-only). (print_ident): Respect skipping_printing, Support v0 identifiers. (print_lifetime_from_index): Add (v0-only). (demangle_binder): Add (v0-only). (demangle_path): Add (v0-only). (demangle_generic_arg): Add (v0-only). (demangle_type): Add (v0-only). (demangle_path_maybe_open_generics): Add (v0-only). (demangle_dyn_trait): Add (v0-only). (demangle_const): Add (v0-only). (demangle_const_uint): Add (v0-only). (basic_type): Add (v0-only). (rust_demangle_callback): Support v0 symbols. * testsuite/rust-demangle-expected: Add v0 testcases. 2020-11-13 Seija Kijin * strstr.c (strstr): Make implementation ANSI/POSIX compliant. 2020-11-11 Patrick Palka PR c++/88115 * cp-demangle.c (d_print_comp_inner) : Don't print the "operator " prefix for __alignof__. : Always print parens around the operand of __alignof__. * testsuite/demangle-expected: Test demangling for __alignof__. 2020-11-09 Christophe Lyon * pex-win32.c (pex_win32_exec_child): Initialize orig_err. 2020-10-06 Martin Liska PR lto/97290 * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections): Use sh_link of a .symtab_shndx section. 2021-01-05 Alan Modra * config.guess: Import from upstream. * config.sub: Likewise. 2020-12-16 Martin Liska Tom de Vries * gdb/debuginfod-support.c (struct user_data): Remove has_printed field. Add meter field. (progressfn): Print progress using meter. 2020-12-02 Enze Li * .gitignore: Add gnu global outputs. 2020-12-02 Simon Marchi * .gitignore: Sync with gcc. 2020-10-26 Andreas Rammhold * src-release.sh: Use sha256sum instead of md5sum. 2020-10-14 Andrew Burgess * Makefile.in: Rebuild. * Makefile.def: Make distclean-gnulib depend on distclean-gdb and distclean-gdbserver. 2020-07-24 Aaron Merey * configure: Rebuild. * configure.ac: Remove AC_DEBUGINFOD. Signed-off-by: Adolf Belka --- config/rootfiles/common/aarch64/binutils | 6 ++++-- config/rootfiles/common/armv5tel/binutils | 6 ++++-- config/rootfiles/common/i586/binutils | 6 ++++-- config/rootfiles/common/x86_64/binutils | 6 ++++-- lfs/binutils | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils index e1635957a..16c441552 100644 --- a/config/rootfiles/common/aarch64/binutils +++ b/config/rootfiles/common/aarch64/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/aarch64elf.x #usr/lib/ldscripts/aarch64elf.xbn @@ -290,7 +292,7 @@ usr/bin/strings #usr/lib/ldscripts/armelfb_linux_eabi.xu #usr/lib/ldscripts/armelfb_linux_eabi.xw #usr/lib/ldscripts/armelfb_linux_eabi.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -304,7 +306,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils index 9680f29ec..cc5845c6e 100644 --- a/config/rootfiles/common/armv5tel/binutils +++ b/config/rootfiles/common/armv5tel/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/armelf_linux_eabi.x #usr/lib/ldscripts/armelf_linux_eabi.xbn @@ -70,7 +72,7 @@ usr/bin/strings #usr/lib/ldscripts/armelfb_linux_eabi.xu #usr/lib/ldscripts/armelfb_linux_eabi.xw #usr/lib/ldscripts/armelfb_linux_eabi.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -84,7 +86,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils index edf115d3a..781c3e254 100644 --- a/config/rootfiles/common/i586/binutils +++ b/config/rootfiles/common/i586/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/elf32_x86_64.x #usr/lib/ldscripts/elf32_x86_64.xbn @@ -158,7 +160,7 @@ usr/bin/strings #usr/lib/ldscripts/elf_x86_64.xu #usr/lib/ldscripts/elf_x86_64.xw #usr/lib/ldscripts/elf_x86_64.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -172,7 +174,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils index edf115d3a..781c3e254 100644 --- a/config/rootfiles/common/x86_64/binutils +++ b/config/rootfiles/common/x86_64/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/elf32_x86_64.x #usr/lib/ldscripts/elf32_x86_64.xbn @@ -158,7 +160,7 @@ usr/bin/strings #usr/lib/ldscripts/elf_x86_64.xu #usr/lib/ldscripts/elf_x86_64.xw #usr/lib/ldscripts/elf_x86_64.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -172,7 +174,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/lfs/binutils b/lfs/binutils index 66730cc34..768a8d7de 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -24,7 +24,7 @@ include Config -VER = 2.35.1 +VER = 2.36.1 THISAPP = binutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -96,7 +96,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7126f370ffbd46c08fcc5ce7aee2805d +$(DL_FILE)_MD5 = 628d490d976d8957279bbbff06cf29d4 install : $(TARGET) From patchwork Wed Apr 21 21:26:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4196 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXD3VKCz44R5 for ; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FQYXD1Mlwz1vH; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FQYXD0TCKz2yK0; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXC0Bk5z2xmd for ; Wed, 21 Apr 2021 21:26:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FQYXB4Nq2zZN; Wed, 21 Apr 2021 21:26:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619040394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SsDFGvkK0r1sJw00v0NYuImMFBDo/WN0QkLgizFfwQA=; b=5Y9xQK5dHdyZ+l4N0Wxms7l7Y8dLwE4PRMAsg3gjY4SPZAaZdhs82Zo/5xKz3x0II3ol7M xt7l40x3WtvIWSCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619040394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SsDFGvkK0r1sJw00v0NYuImMFBDo/WN0QkLgizFfwQA=; b=cLkeCt9at9wUSaVtSuXsXrrhK+Hg55X9dMjwl1R8L7WVm50j1/zfrBrseZYL1M7MDF9neW Bjktga37EpmH3yMn1J4D1WgC61bNDz/aMIAiWlQ7QhqQkEVR3LpGbqoBiezvoAJex2R62U lstqu1FJppJ52pdgwrqDbEkTIjQQd4WiAdP/B4JpbfNTS3yGgtwr/5OVzniylFAuZ0oeM1 7X/pIqCrSQdFXxegqk58ZFqLVEjPnaaxYPbBmfJ7HAkL5P0xiZAqv64fG/9i8T2KC1dp8Y jKxJjb0jR7yZV4si6eQPLIcr1d1ptofj95fuEAAa5yKOw+36XKwP+ORJz32YzA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/4] hyperscan: Patch required to build with updated binutils-2.36.1 Date: Wed, 21 Apr 2021 23:26:24 +0200 Message-Id: <20210421212626.2729436-2-adolf.belka@ipfire.org> In-Reply-To: <20210421212626.2729436-1-adolf.belka@ipfire.org> References: <20210421212626.2729436-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Updated binutils caused failure in build of hyperscan Patch solved the problem https://github.com/intel/hyperscan/issues/292, avoid the compilation error reporting 'undefined reference to `avx2_snprintf`' etc. - Thanks to Michael Tremer and Marcel Lorenz for guidance on the patch Signed-off-by: Adolf Belka --- lfs/hyperscan | 1 + ...can-5.4.0-fix-undefined-reference-to.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch diff --git a/lfs/hyperscan b/lfs/hyperscan index f89b20224..7258d93dd 100644 --- a/lfs/hyperscan +++ b/lfs/hyperscan @@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch new file mode 100644 index 000000000..fdd2543f1 --- /dev/null +++ b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch @@ -0,0 +1,24 @@ +From 66189546403e5476c560bdbad89d24c3df87b172 Mon Sep 17 00:00:00 2001 +From: Yue Ni +Date: Tue, 19 Jan 2021 17:03:02 +0800 +Subject: [PATCH] Fix hyperscan compilation issue for + https://github.com/intel/hyperscan/issues/292, avoid the compilation error + reporting 'undefined reference to `avx2_snprintf`'. + +--- + cmake/build_wrapper.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh +index 1962813f..895610c0 100755 +--- a/cmake/build_wrapper.sh ++++ b/cmake/build_wrapper.sh +@@ -17,7 +17,7 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX) + LIBC_SO=$("$@" --print-file-name=libc.so.6) + cp ${KEEPSYMS_IN} ${KEEPSYMS} + # get all symbols from libc and turn them into patterns +-nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ ]*\).*/^\1$/' >> ${KEEPSYMS} ++nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS} + # build the object + "$@" + # rename the symbols in the object From patchwork Wed Apr 21 21:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4197 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXJ56Ykz44R5 for ; Wed, 21 Apr 2021 21:26:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FQYXJ27PDz2ZP; Wed, 21 Apr 2021 21:26:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FQYXJ1Hf3z2ybC; Wed, 21 Apr 2021 21:26:40 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXH0W1rz2xmd for ; Wed, 21 Apr 2021 21:26:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FQYXG4np4zZN; Wed, 21 Apr 2021 21:26:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619040398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9992Pca7zLW5huwYWz+A1CVvAfpsOY60LuI5ge7yWkw=; b=hClPVgbUQULnjDZ8qmOkYAbnWp4YvY5zF/zNJFnrj96t5kmjTyFVZz0YIPUgxFSyuZKyaJ m6oE//cSiNug7kBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619040398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9992Pca7zLW5huwYWz+A1CVvAfpsOY60LuI5ge7yWkw=; b=TAlFfQkrqumgclHAasEW4iwsV+hyLUoUN6ZrilN5ZGwpxbtJuxvhlacfE2gKI7juHqvSw+ ax+aRgcWM68PRicCojcQ4usZ6tedRNELmb0+B2Vms6M05hzic8ScQq8Kn5nGbJABfJP9A/ 7I/w1r3IYTyZNmid996Vh2vzy7QRyuvKczRilZvHSSXmpYmovMeeJLVGo7ATfMrWU4wOgi 32qjm3ZOd0W9E/CYVByQB4paqkyy3l7x+N1BtzBVwceLIzJI0N/NKfD+qLV4h5nFqGYxMg U/767bK0fzBDjRpHanpT81mIXJy0MiNEiFfkoclDGRPu9eIgAyXmMbOgcEpyRg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/4] qemu: Patch required to build with updated binutils-2.36.1 Date: Wed, 21 Apr 2021 23:26:25 +0200 Message-Id: <20210421212626.2729436-3-adolf.belka@ipfire.org> In-Reply-To: <20210421212626.2729436-1-adolf.belka@ipfire.org> References: <20210421212626.2729436-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Updated binutils caused failure in build of qemu Patch solved the problem This removes the -no-pie flag - Thanks to Michael Tremer and Marcel Lorenz for guidance on the patch Signed-off-by: Adolf Belka --- lfs/qemu | 4 +- src/patches/qemu-5.2.0-no-pie.patch | 67 +++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/patches/qemu-5.2.0-no-pie.patch diff --git a/lfs/qemu b/lfs/qemu index aa09fa0ca..77bd00287 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 30 +PAK_VER = 31 DEPS = libusbredir spice libseccomp @@ -88,6 +88,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-5.2.0-no-pie.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/qemu-5.2.0-no-pie.patch b/src/patches/qemu-5.2.0-no-pie.patch new file mode 100644 index 000000000..8f3f4d590 --- /dev/null +++ b/src/patches/qemu-5.2.0-no-pie.patch @@ -0,0 +1,67 @@ +Recent binutils changes dropping unsupported options [1] caused a build +issue in regard to the optionroms. + + ld -m elf_i386 -T /<>/pc-bios/optionrom//flat.lds -no-pie \ + -s -o multiboot.img multiboot.o + ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) + +This isn't really a regression in ld.bfd, filing the bug upstream +revealed that this never worked as a ld flag [2] - in fact it seems we +were by accident setting --nmagic). + +Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be +droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE +in .mak, therefore we can also remove it from being added there. + +[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d +[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 + +Signed-off-by: Christian Ehrhardt +--- + configure | 3 --- + pc-bios/optionrom/Makefile | 1 - + 2 files changed, 4 deletions(-) + +diff --git a/configure b/configure +index 3f823ed163..61c17c2dde 100755 +--- a/configure ++++ b/configure +@@ -2133,7 +2133,6 @@ EOF + # Check we support --no-pie first; we will need this for building ROMs. + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-no-pie" + fi + + if test "$static" = "yes"; then +@@ -2149,7 +2148,6 @@ if test "$static" = "yes"; then + fi + elif test "$pie" = "no"; then + CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" +- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then + CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" +@@ -6768,7 +6766,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak + echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak + echo "GLIB_LIBS=$glib_libs" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 084fc10f05..30771f8d17 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) + + LD_I386_EMULATION ?= elf_i386 + override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +-override LDFLAGS += $(LDFLAGS_NOPIE) + + all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + +-- +2.29.2 + From patchwork Wed Apr 21 21:26:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4198 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXP5PJTz44R5 for ; Wed, 21 Apr 2021 21:26:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FQYXP36FHz1QR; Wed, 21 Apr 2021 21:26:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FQYXP2Cmpz2y0s; Wed, 21 Apr 2021 21:26:45 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXM59kKz2xTN for ; Wed, 21 Apr 2021 21:26:43 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FQYXM0BCfzZN; Wed, 21 Apr 2021 21:26:42 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619040403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YRu2CdXxCLKL1wMmX/PdpqVZpEdXqEqWugbLCDEz54Y=; b=nzFffzjuQWwR0uDc0TJmfjADwMSwblGz5TU5F7hlaYbBzr+K60jau+DNAy0OobcQThQ10r hkcUZNXf/FjMgxDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619040403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YRu2CdXxCLKL1wMmX/PdpqVZpEdXqEqWugbLCDEz54Y=; b=sgg/Blq2cPr/pq32swBzvmWW0Wp8WmczHf16dYV3TwbdjgY+KxrWVH+pO9fIn0K2u4ijKf BeLU5NLo8agSubIm7aYE2og79dpYOlKQfDghBVRjflrJcRTkpCFPwc/hSqSAU1OmjVoGJk PPgqJ9YoBZegBrCNpwvXFmjyin5l6SXjNBzIfIymdvwAkhzftFFn4wJ57qibFLr8DdM/SP ieajkG80k9O/UeDRBRTcHBu642BK2Bi0b/rSjvab07IDZNqYGDXZmF+6jHe8aSzVBVDq8f qkt1JQwugmZwgaUXygOPqlOEn4bNaV2V+X1AJerUYw8NUVGwqMnS9OyJL9fYuw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/4] strace: add --enable-mpers=check to configure to fix problem from binutils-2.36.1 Date: Wed, 21 Apr 2021 23:26:26 +0200 Message-Id: <20210421212626.2729436-4-adolf.belka@ipfire.org> In-Reply-To: <20210421212626.2729436-1-adolf.belka@ipfire.org> References: <20210421212626.2729436-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Default is --enable-mpers=yes but updated binutils means m32 can not be used. Change to --enable-mpers=check will not stop if m32 is not usable - Thanks to Michael Tremer for guidance on this change Signed-off-by: Adolf Belka --- lfs/strace | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/strace b/lfs/strace index cfce835ec..96430ad80 100644 --- a/lfs/strace +++ b/lfs/strace @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 5 +PAK_VER = 6 DEPS = elfutils @@ -78,7 +78,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr --enable-mpers=check cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)