From f8b2cd122d0fd76bb9acc0dddd69e227c7cccb5b Mon Sep 17 00:00:00 2001 From: Christoph Erhardt Date: Wed, 23 Feb 2022 08:11:57 +0100 Subject: [PATCH] Revert "Fix failing unit test on i686" This reverts commit 5eeedfa448f6dc9b698d64dfccc3393d386f90eb. --- 0003-Fix-dynamic-unit-test-on-i686.patch | 34 ------------------------ mold.spec | 3 --- 2 files changed, 37 deletions(-) delete mode 100644 0003-Fix-dynamic-unit-test-on-i686.patch diff --git a/0003-Fix-dynamic-unit-test-on-i686.patch b/0003-Fix-dynamic-unit-test-on-i686.patch deleted file mode 100644 index 907f712..0000000 --- a/0003-Fix-dynamic-unit-test-on-i686.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 857d311771606ad332264719588af016e5320ede Mon Sep 17 00:00:00 2001 -Message-Id: <857d311771606ad332264719588af016e5320ede.1645598116.git.github@sicherha.de> -From: Christoph Erhardt -Date: Wed, 23 Feb 2022 07:34:21 +0100 -Subject: [PATCH] Fix dynamic unit test on i686 - -Signed-off-by: Christoph Erhardt ---- - test/elf/dynamic.sh | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/test/elf/dynamic.sh b/test/elf/dynamic.sh -index 0ea7ae82..8f9a6628 100755 ---- a/test/elf/dynamic.sh -+++ b/test/elf/dynamic.sh -@@ -30,6 +30,14 @@ EOF - - $CC -B. -o $t/exe -pie $t/b.o - count=$(readelf -W --relocs $t/exe | grep -E 'R_[a-zA-Z0-9_]+_RELATIVE' | wc -l) --readelf -W --dynamic $t/exe | grep -q "RELACOUNT.*\b$count\b" -+ -+case "$(uname -m)" in -+i?86) -+ readelf -W --dynamic $t/exe | grep -q "RELCOUNT.*\b$count\b" -+ ;; -+*) -+ readelf -W --dynamic $t/exe | grep -q "RELACOUNT.*\b$count\b" -+ ;; -+esac - - echo OK --- -2.35.1 - diff --git a/mold.spec b/mold.spec index 874e8d9..c4ab880 100644 --- a/mold.spec +++ b/mold.spec @@ -21,9 +21,6 @@ Patch1: 0001-Skip-reloc-rodata-test-on-aarch64.patch # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68210 Patch2: 0002-Fix-compatibility-with-libstdc-9.patch -# Fix unit test on i686 -Patch3: 0003-Fix-dynamic-unit-test-on-i686.patch - # mold can currently produce native binaries for these architectures only ExclusiveArch: %{ix86} x86_64 aarch64 riscv64