From patchwork Thu Jun 10 21:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastien Bourdelin X-Patchwork-Id: 1490656 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=oqz3Y+up; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G1HLx0J7mz9sRN for ; Fri, 11 Jun 2021 07:35:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CA4084022D; Thu, 10 Jun 2021 21:35:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tngcVQaYwvfV; Thu, 10 Jun 2021 21:35:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 0233B40228; Thu, 10 Jun 2021 21:35:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C48431BF38A for ; Thu, 10 Jun 2021 21:34:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C14C640228 for ; Thu, 10 Jun 2021 21:34:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id avlgx7nQH5DZ for ; Thu, 10 Jun 2021 21:34:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9F39840202 for ; Thu, 10 Jun 2021 21:34:58 +0000 (UTC) Received: by mail-wm1-x332.google.com with SMTP id t4-20020a1c77040000b029019d22d84ebdso7433433wmi.3 for ; Thu, 10 Jun 2021 14:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EAZ8q0X4zjJWOovJvj0jWdHL8cY5X7quSaRBZmaUzp8=; b=oqz3Y+upoUznmjg66a8CAkRfZ3mZGQ/CdD50/2IKKQID4BDMVOw2VAq6vZzateZDsu u/r8qmp1XYridcNCysgZINONadeorLnTSj7Pai5xy4NV4ttF4nS1M6ZGYR/KHTr2b9F8 y04GuZHdKg443JjcyaYGnd+CPwDR6LDRz8tKp0stdsugS9ndsOgtaud4XcJL2XMO/kWI v/Wwcc+rKty5nOuV/kf2TCWUMpRX5U4ypu/ULvb9cO9PtzssqR25KiR5+UCzmHGsVxlN 9g0OoGKNtuJleHKFBWQt/EezdL/7v/4HZ9GBMJUqqcmwoqhi3iyUf7Ms3RkS+ATdIUOn HeAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EAZ8q0X4zjJWOovJvj0jWdHL8cY5X7quSaRBZmaUzp8=; b=DWf8Ow+XmF4xdtqXO711F8yYmzJIdulvZ1PHGGHrWg74g1MQ+RQrw4wHVsMh1J15AJ VlFLZBC/Dx1iO2ChC/8xuRZNfU2Pruxl9vETuovVdZs/dRM6TZjdVrO4XNTBDIQPN1pY VhWjQFlybRcha5Ft3GGQfLOSCMLFPlkJcOJQrgHESgkofcIXPUb2rKW4oCssxGWMlNaw wq4x5stMTzQcBlZNyP2Nb1Nu6Y8Zw8h+rK8WubtCltjPzCxtCsQ+SVjy3HfcaHGJz3gZ AfDGOPjYqMsJsvv+C1VwQe3lp+B06+SS22v6oVtj5p9/G0e1fSuSdxNUx3VHlnsuH1Dd OFvQ== X-Gm-Message-State: AOAM530FvzG8c6zff6ficbJkv3kKeYyR3P4ZHzrdc/+NLH1fxKEksfK6 1Tv49RABOztFK1JUeHeeMEt0Jvwd5vPLufVD X-Google-Smtp-Source: ABdhPJy00IliNZV7CB748Y6kHhdpEZwFWUZ4mSbRezUlMcPl0tP2zGVG853u9cnVl4oN37G3H8GP/A== X-Received: by 2002:a05:600c:1d1a:: with SMTP id l26mr772074wms.189.1623360896386; Thu, 10 Jun 2021 14:34:56 -0700 (PDT) Received: from localhost ([2a01:e0a:a75:66c0:75c4:9a92:2c21:ee08]) by smtp.gmail.com with ESMTPSA id w8sm5313999wre.70.2021.06.10.14.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 14:34:55 -0700 (PDT) From: Sebastien Bourdelin To: buildroot@buildroot.org Date: Thu, 10 Jun 2021 23:34:50 +0200 Message-Id: <20210610213450.1211724-1-sebastien.bourdelin@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/qemu: drop no-pie patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sebastien Bourdelin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit removes the no-pie patch as it is part of qemu 6.0.0. Signed-off-by: Sebastien Bourdelin --- ...-no-pie-is-no-functional-linker-flag.patch | 79 ------------------- 1 file changed, 79 deletions(-) delete mode 100644 package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch diff --git a/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch b/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch deleted file mode 100644 index 6a21949157..0000000000 --- a/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch +++ /dev/null @@ -1,79 +0,0 @@ -From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 -From: Christian Ehrhardt -Date: Mon, 14 Dec 2020 16:09:38 +0100 -Subject: [PATCH] build: -no-pie is no functional linker flag - -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 -Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com> -Cc: qemu-stable@nongnu.org -Signed-off-by: Paolo Bonzini - -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/bbd2d5a8120771ec59b86a80a1f51884e0a26e53] -Signed-off-by: Fabrice Fontaine ---- - configure | 3 --- - pc-bios/optionrom/Makefile | 1 - - 2 files changed, 4 deletions(-) - -diff --git a/configure b/configure -index cb21108d34..c228f7c21e 100755 ---- a/configure -+++ b/configure -@@ -2137,7 +2137,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 -@@ -2153,7 +2152,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" -@@ -6714,7 +6712,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 - --- -GitLab -