|
|
@@ -1,4 +1,4 @@
|
|
|
-From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001
|
|
|
+From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001
|
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
|
Date: Fri, 25 Dec 2015 11:45:38 +0100
|
|
|
Subject: [PATCH] poison-system-directories
|
|
|
@@ -70,7 +70,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
|
ld/configure | 14 ++++++++++++++
|
|
|
ld/configure.ac | 10 ++++++++++
|
|
|
ld/ld.h | 8 ++++++++
|
|
|
- ld/ld.texinfo | 12 ++++++++++++
|
|
|
+ ld/ld.texi | 12 ++++++++++++
|
|
|
ld/ldfile.c | 17 +++++++++++++++++
|
|
|
ld/ldlex.h | 2 ++
|
|
|
ld/ldmain.c | 2 ++
|
|
|
@@ -78,10 +78,10 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
|
9 files changed, 89 insertions(+)
|
|
|
|
|
|
diff --git a/ld/config.in b/ld/config.in
|
|
|
-index 5d91380..ffe84a7 100644
|
|
|
+index d93c9b0..5da2742 100644
|
|
|
--- a/ld/config.in
|
|
|
+++ b/ld/config.in
|
|
|
-@@ -21,6 +21,9 @@
|
|
|
+@@ -31,6 +31,9 @@
|
|
|
language is requested. */
|
|
|
#undef ENABLE_NLS
|
|
|
|
|
|
@@ -92,10 +92,10 @@ index 5d91380..ffe84a7 100644
|
|
|
#undef EXTRA_SHLIB_EXTENSION
|
|
|
|
|
|
diff --git a/ld/configure b/ld/configure
|
|
|
-index da20ab5..63e3da7 100755
|
|
|
+index 300a272..d68890f 100755
|
|
|
--- a/ld/configure
|
|
|
+++ b/ld/configure
|
|
|
-@@ -785,6 +785,7 @@ with_lib_path
|
|
|
+@@ -822,6 +822,7 @@ with_lib_path
|
|
|
enable_targets
|
|
|
enable_64_bit_bfd
|
|
|
with_sysroot
|
|
|
@@ -103,7 +103,7 @@ index da20ab5..63e3da7 100755
|
|
|
enable_gold
|
|
|
enable_got
|
|
|
enable_compressed_debug_sections
|
|
|
-@@ -1443,6 +1444,8 @@ Optional Features:
|
|
|
+@@ -1486,6 +1487,8 @@ Optional Features:
|
|
|
--disable-largefile omit support for large files
|
|
|
--enable-targets alternative target configurations
|
|
|
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
|
|
|
@@ -112,7 +112,7 @@ index da20ab5..63e3da7 100755
|
|
|
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
|
|
|
--enable-got=<type> GOT handling scheme (target, single, negative,
|
|
|
multigot)
|
|
|
-@@ -15497,7 +15500,18 @@ else
|
|
|
+@@ -15803,7 +15806,18 @@ else
|
|
|
fi
|
|
|
|
|
|
|
|
|
@@ -132,10 +132,10 @@ index da20ab5..63e3da7 100755
|
|
|
# Check whether --enable-got was given.
|
|
|
if test "${enable_got+set}" = set; then :
|
|
|
diff --git a/ld/configure.ac b/ld/configure.ac
|
|
|
-index 34315e6..5ade9a0 100644
|
|
|
+index d10c553..9f1b57b 100644
|
|
|
--- a/ld/configure.ac
|
|
|
+++ b/ld/configure.ac
|
|
|
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
|
|
|
+@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
|
|
|
AC_SUBST(TARGET_SYSTEM_ROOT)
|
|
|
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
|
|
|
|
|
|
@@ -153,10 +153,10 @@ index 34315e6..5ade9a0 100644
|
|
|
dnl "install_as_default" is set to false if gold is the default linker.
|
|
|
dnl "installed_linker" is the installed BFD linker name.
|
|
|
diff --git a/ld/ld.h b/ld/ld.h
|
|
|
-index 162e156..7d6d7ef 100644
|
|
|
+index ba914b9..9df17da 100644
|
|
|
--- a/ld/ld.h
|
|
|
+++ b/ld/ld.h
|
|
|
-@@ -177,6 +177,14 @@ typedef struct
|
|
|
+@@ -180,6 +180,14 @@ typedef struct
|
|
|
in the linker script. */
|
|
|
bfd_boolean force_group_allocation;
|
|
|
|
|
|
@@ -171,11 +171,11 @@ index 162e156..7d6d7ef 100644
|
|
|
/* Big or little endian as set on command line. */
|
|
|
enum endian_enum endian;
|
|
|
|
|
|
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
|
|
|
-index bb5f719..78501e4 100644
|
|
|
---- a/ld/ld.texinfo
|
|
|
-+++ b/ld/ld.texinfo
|
|
|
-@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
|
|
|
+diff --git a/ld/ld.texi b/ld/ld.texi
|
|
|
+index 40d79dd..137d46c 100644
|
|
|
+--- a/ld/ld.texi
|
|
|
++++ b/ld/ld.texi
|
|
|
+@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change.
|
|
|
|
|
|
Passing @code{none} for @var{style} disables the setting from any
|
|
|
@code{--build-id} options earlier on the command line.
|
|
|
@@ -195,7 +195,7 @@ index bb5f719..78501e4 100644
|
|
|
|
|
|
@c man end
|
|
|
diff --git a/ld/ldfile.c b/ld/ldfile.c
|
|
|
-index f7e5473..2cd84d3 100644
|
|
|
+index b3d166c..3dcbf66 100644
|
|
|
--- a/ld/ldfile.c
|
|
|
+++ b/ld/ldfile.c
|
|
|
@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
|
|
|
@@ -223,10 +223,10 @@ index f7e5473..2cd84d3 100644
|
|
|
|
|
|
/* Try to open a BFD for a lang_input_statement. */
|
|
|
diff --git a/ld/ldlex.h b/ld/ldlex.h
|
|
|
-index 5aa7f6b..cb655e0 100644
|
|
|
+index 04d6fd5..d7df005 100644
|
|
|
--- a/ld/ldlex.h
|
|
|
+++ b/ld/ldlex.h
|
|
|
-@@ -147,6 +147,8 @@ enum option_values
|
|
|
+@@ -148,6 +148,8 @@ enum option_values
|
|
|
OPTION_REQUIRE_DEFINED_SYMBOL,
|
|
|
OPTION_ORPHAN_HANDLING,
|
|
|
OPTION_FORCE_GROUP_ALLOCATION,
|
|
|
@@ -236,10 +236,10 @@ index 5aa7f6b..cb655e0 100644
|
|
|
|
|
|
/* The initial parser states. */
|
|
|
diff --git a/ld/ldmain.c b/ld/ldmain.c
|
|
|
-index ee5ab11..5f6effd 100644
|
|
|
+index f31eeb2..25f8497 100644
|
|
|
--- a/ld/ldmain.c
|
|
|
+++ b/ld/ldmain.c
|
|
|
-@@ -270,6 +270,8 @@ main (int argc, char **argv)
|
|
|
+@@ -268,6 +268,8 @@ main (int argc, char **argv)
|
|
|
command_line.warn_mismatch = TRUE;
|
|
|
command_line.warn_search_mismatch = TRUE;
|
|
|
command_line.check_section_addresses = -1;
|
|
|
@@ -249,10 +249,10 @@ index ee5ab11..5f6effd 100644
|
|
|
/* We initialize DEMANGLING based on the environment variable
|
|
|
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
|
|
|
diff --git a/ld/lexsup.c b/ld/lexsup.c
|
|
|
-index 08106bc..d619d50 100644
|
|
|
+index 86a033a..f07f095 100644
|
|
|
--- a/ld/lexsup.c
|
|
|
+++ b/ld/lexsup.c
|
|
|
-@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
|
|
|
+@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] =
|
|
|
{ {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
|
|
|
'\0', N_("=MODE"), N_("Control how orphan sections are handled."),
|
|
|
TWO_DASHES },
|
|
|
@@ -267,7 +267,7 @@ index 08106bc..d619d50 100644
|
|
|
};
|
|
|
|
|
|
#define OPTION_COUNT ARRAY_SIZE (ld_options)
|
|
|
-@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
|
|
|
+@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv)
|
|
|
int ingroup = 0;
|
|
|
char *default_dirlist = NULL;
|
|
|
char *shortopts;
|
|
|
@@ -275,9 +275,9 @@ index 08106bc..d619d50 100644
|
|
|
struct option *longopts;
|
|
|
struct option *really_longopts;
|
|
|
int last_optind;
|
|
|
-@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
|
|
|
- }
|
|
|
- break;
|
|
|
+@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv)
|
|
|
+ }
|
|
|
+ break;
|
|
|
|
|
|
+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
|
|
|
+ command_line.poison_system_directories = FALSE;
|
|
|
@@ -290,7 +290,7 @@ index 08106bc..d619d50 100644
|
|
|
case OPTION_PUSH_STATE:
|
|
|
input_flags.pushed = xmemdup (&input_flags,
|
|
|
sizeof (input_flags),
|
|
|
-@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
|
|
|
+@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv)
|
|
|
command_line.soname = NULL;
|
|
|
}
|
|
|
|
|
|
@@ -302,5 +302,5 @@ index 08106bc..d619d50 100644
|
|
|
{
|
|
|
lang_leave_group ();
|
|
|
--
|
|
|
-2.9.4
|
|
|
+2.7.4
|
|
|
|
Evgeniy Didin