From 47b8db23ff55dd29992198dfbadda53984a4ab2d Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sat, 25 Jul 2020 15:20:24 +0300 Subject: Textrel warnings have been enabled upstream, drop patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- ...oo-ld-always-warn-about-textrels-in-files.patch | 30 ---------- ...an-option-no-warn-shared-textrel-self-exp.patch | 66 ---------------------- 2 files changed, 96 deletions(-) delete mode 100644 9999/0001-Gentoo-ld-always-warn-about-textrels-in-files.patch delete mode 100644 9999/0002-Gentoo-Add-an-option-no-warn-shared-textrel-self-exp.patch diff --git a/9999/0001-Gentoo-ld-always-warn-about-textrels-in-files.patch b/9999/0001-Gentoo-ld-always-warn-about-textrels-in-files.patch deleted file mode 100644 index d60b0a1..0000000 --- a/9999/0001-Gentoo-ld-always-warn-about-textrels-in-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5e2144e41600a83f6127eb44d739ed170d78ac7f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 16 May 2005 22:10:19 -0400 -Subject: [PATCH 1/9] Gentoo: ld: always warn about textrels in files - -textrels are bad for forcing copy-on-write (this affects everyone), and for -security/runtime code generation, this affects security ppl. But in either -case, it doesn't matter who needs textrels, it's the very fact that they're -needed at all. - -(cherry picked from commit cd6411ad57aab78686f67cbbc1ed70ee810ad335) ---- - ld/ldmain.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 04a3f7a511..c3f473f661 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -299,6 +299,7 @@ main (int argc, char **argv) - link_info.dynamic_undefined_weak = -1; - link_info.pei386_auto_import = -1; - link_info.spare_dynamic_tags = 5; -+ link_info.warn_shared_textrel = TRUE; - link_info.path_separator = ':'; - #ifdef DEFAULT_FLAG_COMPRESS_DEBUG - link_info.compress_debug = COMPRESS_DEBUG_GABI_ZLIB; --- -2.26.2 - diff --git a/9999/0002-Gentoo-Add-an-option-no-warn-shared-textrel-self-exp.patch b/9999/0002-Gentoo-Add-an-option-no-warn-shared-textrel-self-exp.patch deleted file mode 100644 index 5457b83..0000000 --- a/9999/0002-Gentoo-Add-an-option-no-warn-shared-textrel-self-exp.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 19ecd671bddd33f3afff169f26c55101c90c4afc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= -Date: Sun, 3 Jun 2018 21:12:16 +0200 -Subject: [PATCH 2/9] Gentoo: Add an option --no-warn-shared-textrel - (self-explanatory) - ---- - ld/ld.texi | 4 ++++ - ld/ldlex.h | 1 + - ld/lexsup.c | 6 ++++++ - 3 files changed, 11 insertions(+) - -diff --git a/ld/ld.texi b/ld/ld.texi -index 4dc78e65fa..621d05dc05 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2408,6 +2408,10 @@ the section (@pxref{SECTIONS}). - @item --warn-shared-textrel - Warn if the linker adds a DT_TEXTREL to a shared object. - -+@kindex --no-warn-shared-textrel -+@item --no-warn-shared-textrel -+Do not warn if the linker adds a DT_TEXTREL to a shared object. -+ - @kindex --warn-alternate-em - @item --warn-alternate-em - Warn if an object has alternate ELF machine code. -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 22b928d2d9..aeaea4dfee 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -131,6 +131,7 @@ enum option_values - OPTION_WARN_UNRESOLVED_SYMBOLS, - OPTION_ERROR_UNRESOLVED_SYMBOLS, - OPTION_WARN_SHARED_TEXTREL, -+ OPTION_NO_WARN_SHARED_TEXTREL, - OPTION_WARN_ALTERNATE_EM, - OPTION_REDUCE_MEMORY_OVERHEADS, - #ifdef ENABLE_PLUGINS -diff --git a/ld/lexsup.c b/ld/lexsup.c -index c02041d5f1..c5edc25793 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -519,6 +519,9 @@ static const struct ld_option ld_options[] = - { {"warn-shared-textrel", no_argument, NULL, OPTION_WARN_SHARED_TEXTREL}, - '\0', NULL, N_("Warn if shared object has DT_TEXTREL"), - TWO_DASHES }, -+ { {"no-warn-shared-textrel", no_argument, NULL, OPTION_NO_WARN_SHARED_TEXTREL}, -+ '\0', NULL, N_("Do not warn if shared object has DT_TEXTREL"), -+ TWO_DASHES }, - { {"warn-alternate-em", no_argument, NULL, OPTION_WARN_ALTERNATE_EM}, - '\0', NULL, N_("Warn if an object has alternate ELF machine code"), - TWO_DASHES }, -@@ -1449,6 +1452,9 @@ parse_args (unsigned argc, char **argv) - case OPTION_WARN_SHARED_TEXTREL: - link_info.warn_shared_textrel = TRUE; - break; -+ case OPTION_NO_WARN_SHARED_TEXTREL: -+ link_info.warn_shared_textrel = FALSE; -+ break; - case OPTION_WARN_ALTERNATE_EM: - link_info.warn_alternate_em = TRUE; - break; --- -2.26.2 - -- cgit v1.2.3-65-gdbad