public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/
@ 2022-09-30  8:20 Matthew Smith
  0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2022-09-30  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a16af49612406ad7be6f1eecf077939f962988b6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 14 06:45:30 2022 +0000
Commit:     Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 08:09:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16af496

sys-devel/mold: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27244
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>

 .../mold/files/mold-1.2.1-install-nopython.patch   | 34 ----------------------
 .../mold/files/mold-1.3.0-openssl-pkgconfig.patch  | 28 ------------------
 .../mold/files/mold-1.3.1-fix-riscv-set32.patch    | 25 ----------------
 3 files changed, 87 deletions(-)

diff --git a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
deleted file mode 100644
index 661d3dcf392f..000000000000
--- a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4fb6d4208cfb20bad4a3491a18e78409b5a8183f Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Sat, 30 Apr 2022 07:42:50 +0100
-Subject: [PATCH] Don't invoke Python to create libexec/mold/ld symlink
-
-Reverts commits 8073a92614fb59f59570031badab5dd4bc3b4f7f and
-5803c3c200f301adc3abdb66df16d3d669712d70.
-
-Bug #841575
----
- Makefile | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d1abc850..10e053a9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -204,12 +204,7 @@ install: all
- 	$(STRIP) $D$(LIBDIR)/mold/mold-wrapper.so
- 
- 	$(INSTALL) -d $D$(LIBEXECDIR)/mold
--
--# We want to make a symblink with a relative path, so that users can
--# move the entire directory to other place without breaking the reference.
--# GNU ln supports `--relative` to do that, but that's not supported by
--# non-GNU systems. So we use Python to compute a relative path.
--	ln -sf `python3 -c "import os.path; print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` $D$(LIBEXECDIR)/mold/ld
-+	ln -sf $(BINDIR)/mold $D$(LIBEXECDIR)/mold/ld
- 
- 	$(INSTALL) -d $D$(MANDIR)/man1
- 	$(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1
--- 
-2.35.3
-

diff --git a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
deleted file mode 100644
index d2ed0af47b41..000000000000
--- a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4fde946f49cddf4f7c1eceb3b86ca38375cec1d Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Sun, 26 Jun 2022 13:44:36 +0100
-Subject: [PATCH] Revert "Do not use pkg-config"
-
-This reverts commit 4ef90d4316bbba3a4b8902e38bf5f68171cc6ab7.
---- a/Makefile
-+++ b/Makefile
-@@ -18,6 +18,9 @@ ifeq ($(origin CXX), default)
-   CXX = c++
- endif
- 
-+# Allow overriding pkg-config binary
-+PKG_CONFIG = pkg-config
-+
- # If you want to keep symbols in the installed binary, run make with
- # `STRIP=true` to run /bin/true instead of the strip command.
- STRIP = strip
-@@ -100,7 +103,8 @@ ifeq ($(OS), Darwin)
- endif
- 
- ifeq ($(NEEDS_LIBCRYPTO), 1)
--  MOLD_LDFLAGS += -lcrypto
-+  MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl)
-+  MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto
- endif
- 
- # '-latomic' flag is needed building on riscv64 system.

diff --git a/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch b/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
deleted file mode 100644
index 5613d8ddc003..000000000000
--- a/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From https://github.com/rui314/mold/pull/590
-From 68bd00caa7c7946f380f72a5dd263e7c1d436e9f Mon Sep 17 00:00:00 2001
-From: Alex Fan <alex.fan.q@gmail.com>
-Date: Thu, 28 Jul 2022 14:04:21 +1000
-Subject: [PATCH] [ELF][RISCV] add missing R_RISCV_SET32 in EhFrameSection
-
-Signed-off-by: Alex Fan <alex.fan.q@gmail.com>
----
- elf/arch-riscv64.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/elf/arch-riscv64.cc b/elf/arch-riscv64.cc
-index 8761c6ac..0c589118 100644
---- a/elf/arch-riscv64.cc
-+++ b/elf/arch-riscv64.cc
-@@ -183,6 +183,9 @@ void EhFrameSection<E>::apply_reloc(Context<E> &ctx, const ElfRel<E> &rel,
-   case R_RISCV_SET16:
-     *(ul16 *)loc = val;
-     return;
-+  case R_RISCV_SET32:
-+    *(ul32 *)loc = val;
-+    return;
-   case R_RISCV_32_PCREL:
-     *(ul32 *)loc = val - this->shdr.sh_addr - offset;
-     return;


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/
@ 2022-10-15 19:34 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-10-15 19:34 UTC (permalink / raw
  To: gentoo-commits

commit:     061ba141084aa969d84fe96913a1c8f6bd6b183b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct  7 20:27:24 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061ba141

sys-devel/mold: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27688
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-devel/mold/files/mold-1.4.1-glob-tests.patch | 296 -----------------------
 1 file changed, 296 deletions(-)

diff --git a/sys-devel/mold/files/mold-1.4.1-glob-tests.patch b/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
deleted file mode 100644
index ad9dda565323..000000000000
--- a/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 60070e0c1352a1cc6b02a0d1a30c657368a033c3 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@bluewhale.systems>
-Date: Fri, 19 Aug 2022 20:05:26 +0800
-Subject: [PATCH] Simplify
-
----
- test/elf/CMakeLists.txt   | 265 +-------------------------------------
- test/macho/CMakeLists.txt | 100 +-------------
- 2 files changed, 6 insertions(+), 359 deletions(-)
-
-diff --git a/test/elf/CMakeLists.txt b/test/elf/CMakeLists.txt
-index 5d15d6cb..138e8205 100644
---- a/test/elf/CMakeLists.txt
-+++ b/test/elf/CMakeLists.txt
-@@ -1,269 +1,12 @@
--set(MOLD_ELF_TESTS
--  absolute-symbols
--  allow-multiple-definition
--  ar-alignment
--  arm32-thumb-interwork
--  as-needed
--  as-needed-weak
--  as-needed2
--  auxiliary
--  basic
--  bno-symbolic
--  bsymbolic
--  bsymbolic-functions
--  bug178
--  build-id
--  canonical-plt
--  cmdline
--  color-diagnostics
--  comment
--  common
--  common-archive
--  common-ref
--  compress-debug-sections
--  compressed-debug-info
--  compressed-debug-info-gnu
--  copyrel
--  copyrel-protected
--  copyrel-relro
--  dead-debug-sections
--  debug-macro-section
--  default-symver
--  defsym
--  defsym2
--  demangle
--  demangle-rust
--  dependency-file
--  disable-new-dtags
--  discard
--  dso-undef
--  dt-init
--  dt-needed
--  duplicate-error
--  dynamic
--  dynamic-dt-debug
--  dynamic-linker
--  dynamic-list
--  dynamic-list2
--  dynamic-list3
--  emit-relocs
--  empty-file
--  empty-input
--  empty-version
--  emulation-deduction
--  entry
--  exception
--  exception-mcmodel-large
--  exclude-libs
--  exclude-libs2
--  exclude-libs3
--  execstack
--  execstack-if-needed
--  export-dynamic
--  export-from-exe
--  fatal-warnings
--  filler
--  filter
--  func-addr
--  gc-sections
--  gdb-index-compress-output
--  gdb-index-dwarf2
--  gdb-index-dwarf3
--  gdb-index-dwarf4
--  gdb-index-dwarf5
--  gdb-index-empty
--  glibc-2.22-bug
--  gnu-hash
--  gnu-linkonce
--  gnu-retain
--  gnu-unique
--  gnu-warning
--  hello-dynamic
--  hello-static
--  help
--  hidden-undef
--  icf
--  icf-small
--  ifunc-dso
--  ifunc-dynamic
--  ifunc-export
--  ifunc-static
--  ifunc-static-pie
--  image-base
--  incompatible-libs
--  incompatible-libs2
--  incompatible-obj
--  init
--  init-array
--  init-array-priorities
--  init-array-readonly
--  init-in-dso
--  initfirst
--  interpose
--  invalid-version-script
--  large-alignment
--  large-alignment-dso
--  link-order
--  linker-script
--  linker-script-defsym
--  linker-script2
--  linker-script3
--  linker-script4
--  lto-archive
--  lto-dso
--  lto-gcc
--  lto-llvm
--  lto-version-script
--  many-sections
--  mergeable-records
--  mergeable-strings
--  missing-but-ok
--  missing-error
--  mold-wrapper
--  mold-wrapper2
--  no-quick-exit
--  nocopyreloc
--  noinhibit-exec
--  non-canonical-plt
--  nostdlib
--  note
--  note-property
--  note2
--  now
--  oformat-binary
--  omagic
--  pack-dyn-relocs-relr
--  package-metadata
--  pie
--  plt
--  plt-dso
--  pltgot
--  preinit-array
--  print-dependencies
--  protected
--  protected-dynsym
--  push-pop-state
--  relax
--  reloc
--  reloc-overflow
--  reloc-rodata
--  reloc-zero
--  relocatable
--  relocatable-archive
--  relro
--  repro
--  require-defined
--  response-file
--  retain-symbols-file
--  reverse-sections
--  rodata-name
--  rosegment
--  rpath
--  run
--  run-clang
--  section-alignment
--  section-name
--  section-start
--  shared
--  shuffle-sections
--  shuffle-sections-seed
--  soname
--  start-lib
--  start-stop-symbol
--  static-archive
--  static-pie
--  stdout
--  strip
--  symbol-rank
--  symbol-version
--  symbol-version2
--  symbol-version3
--  symtab
--  symtab-dso
--  symtab-section-symbols
--  synthetic-symbols
--  sysroot
--  sysroot-linker-script
--  sysroot2
--  thin-archive
--  thread-count
--  tls-common
--  tls-dso
--  tls-gd
--  tls-gd-mcmodel-large
--  tls-gd-noplt
--  tls-gd2
--  tls-ie
--  tls-large-tbss
--  tls-ld
--  tls-ld-mcmodel-large
--  tls-ld-noplt
--  tls-le
--  tls-module-base
--  tls-nopic
--  tls-pic
--  tlsdesc
--  tlsdesc-import
--  tlsdesc-static
--  trace
--  trace-symbol
--  undefined
--  unique
--  unresolved-symbols
--  verbose
--  version
--  version-script
--  version-script10
--  version-script11
--  version-script12
--  version-script13
--  version-script14
--  version-script15
--  version-script16
--  version-script17
--  version-script2
--  version-script3
--  version-script4
--  version-script5
--  version-script6
--  version-script7
--  version-script8
--  version-script9
--  versioned-undef
--  visibility
--  warn-common
--  warn-execstack
--  warn-once
--  warn-shared-textrel
--  warn-textrel
--  warn-unresolved-symbols
--  weak-export-dso
--  weak-export-exe
--  weak-undef
--  whole-archive
--  wrap
--  z-cet-report
--  z-defs
--  z-ibt
--  z-ibtplt
--  z-max-page-size
--  z-nodefaultlib
--  z-nodump
--  z-now
--  z-origin
--  z-separate-code
--  z-shstk
--  z-text
--  z-unknown
--  )
--
- option(MOLD_ENABLE_QEMU_TESTS "Enable tests for other targets" OFF)
- 
-+file(GLOB MOLD_ELF_TESTS RELATIVE ${CMAKE_CURRENT_LIST_DIR} "*.sh")
-+
- function(mold_add_arch_test NAME TRIPLE MACHINE)
-   if(NOT ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL ${MACHINE})
-     set(TEST_NAME "${MACHINE}-${NAME}")
-     add_test(NAME ${TEST_NAME}
--      COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${NAME}.sh
-+      COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${NAME}
-       WORKING_DIRECTORY ${mold_BINARY_DIR})
- 
-     set(TEST_ENV
-@@ -280,7 +23,7 @@ endfunction()
- 
- foreach(TEST IN LISTS MOLD_ELF_TESTS)
-   add_test(NAME "${CMAKE_HOST_SYSTEM_PROCESSOR}-${TEST}"
--    COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${TEST}.sh
-+    COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${TEST}
-     WORKING_DIRECTORY ${mold_BINARY_DIR})
- 
-   if(MOLD_ENABLE_QEMU_TESTS)


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/
@ 2023-11-24 17:36 Ulrich Müller
  0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2023-11-24 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     7e79d9f089364a8d1ae9d95f03fd6e5ecae2920b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Nov 23 17:18:26 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 17:36:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e79d9f0

sys-devel/mold: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../mold/files/mold-2.0.0-DT_RELR-dependency.patch | 161 ---------------------
 .../mold/files/mold-2.0.0-reloc-test-fix.patch     |  58 --------
 2 files changed, 219 deletions(-)

diff --git a/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch b/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
deleted file mode 100644
index 267afde230d2..000000000000
--- a/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-https://bugs.gentoo.org/911591
-https://bugzilla.mozilla.org/show_bug.cgi?id=1847697
-https://github.com/rui314/mold/issues/653#event-10041847648
-https://github.com/rui314/mold/commit/f467ad1add2ab6e381e0e458f026df197e63d487
-
-From f467ad1add2ab6e381e0e458f026df197e63d487 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@bluewhale.systems>
-Date: Wed, 9 Aug 2023 11:40:09 +0900
-Subject: [PATCH] Create a symbol version dependency to GLIBC_ABI_DT_RELR
-
-Fixes https://github.com/rui314/mold/issues/653
----
- elf/cmdline.cc                     |  2 ++
- elf/mold.h                         |  1 +
- elf/output-chunks.cc               | 44 +++++++++++++++++++++++++-----
- test/elf/z-pack-relative-relocs.sh | 16 +++++++++++
- 4 files changed, 56 insertions(+), 7 deletions(-)
- create mode 100755 test/elf/z-pack-relative-relocs.sh
-
-diff --git a/elf/cmdline.cc b/elf/cmdline.cc
-index c568ce086..82a0e6869 100644
---- a/elf/cmdline.cc
-+++ b/elf/cmdline.cc
-@@ -875,8 +875,10 @@ std::vector<std::string> parse_nonpositional_args(Context<E> &ctx) {
-       ctx.arg.z_nodefaultlib = true;
-     } else if (read_z_flag("pack-relative-relocs")) {
-       ctx.arg.pack_dyn_relocs_relr = true;
-+      ctx.arg.z_pack_relative_relocs = true;
-     } else if (read_z_flag("nopack-relative-relocs")) {
-       ctx.arg.pack_dyn_relocs_relr = false;
-+      ctx.arg.z_pack_relative_relocs = false;
-     } else if (read_z_flag("separate-loadable-segments")) {
-       z_separate_code = SEPARATE_LOADABLE_SEGMENTS;
-     } else if (read_z_flag("separate-code")) {
-diff --git a/elf/mold.h b/elf/mold.h
-index e5532211c..3a027f1e9 100644
---- a/elf/mold.h
-+++ b/elf/mold.h
-@@ -1831,6 +1831,7 @@ struct Context {
-     bool z_nodefaultlib = false;
-     bool z_now = false;
-     bool z_origin = false;
-+    bool z_pack_relative_relocs = false;
-     bool z_relro = true;
-     bool z_sectionheader = true;
-     bool z_shstk = false;
-diff --git a/elf/output-chunks.cc b/elf/output-chunks.cc
-index 726a4da2b..3896a2991 100644
---- a/elf/output-chunks.cc
-+++ b/elf/output-chunks.cc
-@@ -2373,12 +2373,13 @@ void VerneedSection<E>::construct(Context<E> &ctx) {
-            std::tuple(((SharedFile<E> *)b->file)->soname, b->ver_idx);
-   });
- 
--  // Resize of .gnu.version
-+  // Resize .gnu.version
-   ctx.versym->contents.resize(ctx.dynsym->symbols.size(), 1);
-   ctx.versym->contents[0] = 0;
- 
-   // Allocate a large enough buffer for .gnu.version_r.
--  contents.resize((sizeof(ElfVerneed<E>) + sizeof(ElfVernaux<E>)) * syms.size());
-+  contents.resize((sizeof(ElfVerneed<E>) + sizeof(ElfVernaux<E>)) *
-+                  (syms.size() + 1));
- 
-   // Fill .gnu.version_r.
-   u8 *buf = (u8 *)&contents[0];
-@@ -2394,14 +2395,14 @@ void VerneedSection<E>::construct(Context<E> &ctx) {
-       verneed->vn_next = ptr - (u8 *)verneed;
- 
-     verneed = (ElfVerneed<E> *)ptr;
--    ptr += sizeof(*verneed);
-+    ptr += sizeof(ElfVerneed<E>);
-     verneed->vn_version = 1;
-     verneed->vn_file = ctx.dynstr->find_string(((SharedFile<E> *)file)->soname);
-     verneed->vn_aux = sizeof(ElfVerneed<E>);
-     aux = nullptr;
-   };
- 
--  auto add_entry = [&](Symbol<E> *sym) {
-+  auto add_entry = [&](std::string_view verstr) {
-     verneed->vn_cnt++;
- 
-     if (aux)
-@@ -2409,23 +2410,52 @@ void VerneedSection<E>::construct(Context<E> &ctx) {
-     aux = (ElfVernaux<E> *)ptr;
-     ptr += sizeof(*aux);
- 
--    std::string_view verstr = sym->get_version();
-     aux->vna_hash = elf_hash(verstr);
-     aux->vna_other = ++veridx;
-     aux->vna_name = ctx.dynstr->add_string(verstr);
-   };
- 
-+  // Create version entries.
-   for (i64 i = 0; i < syms.size(); i++) {
-     if (i == 0 || syms[i - 1]->file != syms[i]->file) {
-       start_group(syms[i]->file);
--      add_entry(syms[i]);
-+      add_entry(syms[i]->get_version());
-     } else if (syms[i - 1]->ver_idx != syms[i]->ver_idx) {
--      add_entry(syms[i]);
-+      add_entry(syms[i]->get_version());
-     }
- 
-     ctx.versym->contents[syms[i]->get_dynsym_idx(ctx)] = veridx;
-   }
- 
-+  if (ctx.arg.z_pack_relative_relocs) {
-+    // If `-z pack-relative-relocs` is specified, we'll create a .relr.dyn
-+    // section and store base relocation records to that section instead of
-+    // to the usual .rela.dyn section.
-+    //
-+    // .relr.dyn is relatively new feature and not supported by glibc until
-+    // 2.38 which was released in 2022. Executables built with `-z
-+    // pack-relative-relocs` don't work and usually crash immediately on
-+    // startup if libc doesn't support it.
-+    //
-+    // In the following code, we'll add a dependency to a dummy version name
-+    // "GLIBC_ABI_DT_RELR" so that executables built with the option failed
-+    // with a more friendly "version `GLIBC_ABI_DT_RELR' not found" error
-+    // message. glibc 2.38 or later knows about this dummy version name and
-+    // simply ignores it.
-+    auto find_glibc2 = [&]() -> InputFile<E> * {
-+      for (Symbol<E> *sym : syms)
-+        if (((SharedFile<E> *)sym->file)->soname.starts_with("libc.so.") &&
-+            sym->get_version().starts_with("GLIBC_2."))
-+          return sym->file;
-+      return nullptr;
-+    };
-+
-+    if (InputFile<E> *file = find_glibc2()) {
-+      start_group(file);
-+      add_entry("GLIBC_ABI_DT_RELR");
-+    }
-+  }
-+
-   // Resize .gnu.version_r to fit to its contents.
-   contents.resize(ptr - buf);
- }
-diff --git a/test/elf/z-pack-relative-relocs.sh b/test/elf/z-pack-relative-relocs.sh
-new file mode 100755
-index 000000000..e09d441e7
---- /dev/null
-+++ b/test/elf/z-pack-relative-relocs.sh
-@@ -0,0 +1,16 @@
-+#!/bin/bash
-+. $(dirname $0)/common.inc
-+
-+cat <<EOF | $CC -o $t/a.o -fPIC -c -xc -
-+#include <stdio.h>
-+int main() {
-+  printf("Hello world\n");
-+}
-+EOF
-+
-+$CC -B. -o $t/exe $t/a.o -pie -Wl,-z,pack-relative-relocs
-+
-+readelf -W -V $t/exe > $t/log
-+grep -Fq GLIBC_2. $t/log || skip
-+
-+grep -q GLIBC_ABI_DT_RELR $t/log

diff --git a/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch b/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch
deleted file mode 100644
index 8e6e04f5d535..000000000000
--- a/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://github.com/rui314/mold/issues/1067
-https://github.com/rui314/mold/commit/1582b720d58df61bc4c0ae39fa269e3b250b94df
-
-From 1582b720d58df61bc4c0ae39fa269e3b250b94df Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@bluewhale.systems>
-Date: Fri, 28 Jul 2023 14:58:57 +0900
-Subject: [PATCH] Weak undefs should not keep DSOs alive
-
-Fixes https://github.com/rui314/mold/issues/1067
---- a/elf/input-files.cc
-+++ b/elf/input-files.cc
-@@ -1396,7 +1396,8 @@ SharedFile<E>::mark_live_objects(Context<E> &ctx,
-     if (sym.is_traced)
-       print_trace_symbol(ctx, *this, esym, sym);
- 
--    if (esym.is_undef() && sym.file && !sym.file->is_alive.test_and_set()) {
-+    if (esym.is_undef() && !esym.is_weak() && sym.file &&
-+        !sym.file->is_alive.test_and_set()) {
-       feeder(sym.file);
- 
-       if (sym.is_traced)
---- /dev/null
-+++ b/test/elf/as-needed-dso2.sh
-@@ -0,0 +1,33 @@
-+#!/bin/bash
-+. $(dirname $0)/common.inc
-+
-+cat <<EOF | $CC -c -fPIC -o $t/a.o -xc -
-+int foo() {
-+  return 0;
-+}
-+EOF
-+
-+cat <<EOF | $CC -c -fPIC -o $t/b.o -xc -
-+__attribute__((weak)) int foo();
-+
-+int bar() {
-+  if (foo) return foo();
-+  return 0;
-+}
-+EOF
-+
-+cat <<EOF | $CC -xc -c -o $t/c.o -
-+int bar();
-+
-+int main() {
-+  return bar();
-+}
-+EOF
-+
-+$CC -B. -shared -o $t/libfoo.so $t/a.o
-+$CC -B. -shared -o $t/libbar.so $t/b.o
-+$CC -B. -o $t/exe $t/c.o -L$t -Wl,--as-needed -lfoo -lbar
-+
-+readelf --dynamic $t/exe > $t/log
-+! grep libfoo.so $t/log || false
-+grep -q libbar.so $t/log
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-11-24 17:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-15 19:34 [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2023-11-24 17:36 Ulrich Müller
2022-09-30  8:20 Matthew Smith

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox