Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From 413075afbdb16e7cc05511682ca9e3c880acb5a7 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 08/17] warn for uses of system directories when cross linking |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> |
| 7 | |
| 8 | ld/ |
| 9 | * ld.h (args_type): Add error_poison_system_directories. |
| 10 | * ld.texinfo (--error-poison-system-directories): Document. |
| 11 | * ldfile.c (ldfile_add_library_path): Check |
| 12 | command_line.error_poison_system_directories. |
| 13 | * ldmain.c (main): Initialize |
| 14 | command_line.error_poison_system_directories. |
| 15 | * lexsup.c (enum option_values): Add |
| 16 | OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. |
| 17 | (ld_options): Add --error-poison-system-directories. |
| 18 | (parse_args): Handle new option. |
| 19 | |
| 20 | 2007-06-13 Joseph Myers <joseph@codesourcery.com> |
| 21 | |
| 22 | ld/ |
| 23 | * config.in: Regenerate. |
| 24 | * ld.h (args_type): Add poison_system_directories. |
| 25 | * ld.texinfo (--no-poison-system-directories): Document. |
| 26 | * ldfile.c (ldfile_add_library_path): Check |
| 27 | command_line.poison_system_directories. |
| 28 | * ldmain.c (main): Initialize |
| 29 | command_line.poison_system_directories. |
| 30 | * lexsup.c (enum option_values): Add |
| 31 | OPTION_NO_POISON_SYSTEM_DIRECTORIES. |
| 32 | (ld_options): Add --no-poison-system-directories. |
| 33 | (parse_args): Handle new option. |
| 34 | |
| 35 | 2007-04-20 Joseph Myers <joseph@codesourcery.com> |
| 36 | |
| 37 | Merge from Sourcery G++ binutils 2.17: |
| 38 | |
| 39 | 2007-03-20 Joseph Myers <joseph@codesourcery.com> |
| 40 | Based on patch by Mark Hatle <mark.hatle@windriver.com>. |
| 41 | ld/ |
| 42 | * configure.in (--enable-poison-system-directories): New option. |
| 43 | * configure, config.in: Regenerate. |
| 44 | * ldfile.c (ldfile_add_library_path): If |
| 45 | ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, |
| 46 | /usr/lib, /usr/local/lib or /usr/X11R6/lib. |
| 47 | |
| 48 | Upstream-Status: Pending |
| 49 | |
| 50 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 51 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 52 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 53 | --- |
| 54 | ld/config.in | 3 +++ |
| 55 | ld/configure | 16 ++++++++++++++++ |
| 56 | ld/configure.ac | 10 ++++++++++ |
| 57 | ld/ld.h | 8 ++++++++ |
| 58 | ld/ld.texi | 12 ++++++++++++ |
| 59 | ld/ldfile.c | 17 +++++++++++++++++ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 60 | ld/ldlex.h | 5 +++++ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 61 | ld/ldmain.c | 2 ++ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 62 | ld/lexsup.c | 27 +++++++++++++++++++++++++++ |
| 63 | 9 files changed, 100 insertions(+) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 64 | |
| 65 | diff --git a/ld/config.in b/ld/config.in |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 66 | index f1712107367..308e0173c16 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 67 | --- a/ld/config.in |
| 68 | +++ b/ld/config.in |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 69 | @@ -40,6 +40,9 @@ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 70 | language is requested. */ |
| 71 | #undef ENABLE_NLS |
| 72 | |
| 73 | +/* Define to warn for use of native system library directories */ |
| 74 | +#undef ENABLE_POISON_SYSTEM_DIRECTORIES |
| 75 | + |
| 76 | /* Additional extension a shared object might have. */ |
| 77 | #undef EXTRA_SHLIB_EXTENSION |
| 78 | |
| 79 | diff --git a/ld/configure b/ld/configure |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 80 | index f08ce9969ea..1c872c0db5f 100755 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 81 | --- a/ld/configure |
| 82 | +++ b/ld/configure |
| 83 | @@ -826,6 +826,7 @@ with_lib_path |
| 84 | enable_targets |
| 85 | enable_64_bit_bfd |
| 86 | with_sysroot |
| 87 | +enable_poison_system_directories |
| 88 | enable_gold |
| 89 | enable_got |
| 90 | enable_compressed_debug_sections |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 91 | @@ -1493,6 +1494,8 @@ Optional Features: |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 92 | --disable-largefile omit support for large files |
| 93 | --enable-targets alternative target configurations |
| 94 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) |
| 95 | + --enable-poison-system-directories |
| 96 | + warn for use of native system library directories |
| 97 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] |
| 98 | --enable-got=<type> GOT handling scheme (target, single, negative, |
| 99 | multigot) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 100 | @@ -15793,6 +15796,19 @@ fi |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 101 | |
| 102 | |
| 103 | |
| 104 | +# Check whether --enable-poison-system-directories was given. |
| 105 | +if test "${enable_poison_system_directories+set}" = set; then : |
| 106 | + enableval=$enable_poison_system_directories; |
| 107 | +else |
| 108 | + enable_poison_system_directories=no |
| 109 | +fi |
| 110 | + |
| 111 | +if test "x${enable_poison_system_directories}" = "xyes"; then |
| 112 | + |
| 113 | +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h |
| 114 | + |
| 115 | +fi |
| 116 | + |
| 117 | # Check whether --enable-gold was given. |
| 118 | if test "${enable_gold+set}" = set; then : |
| 119 | enableval=$enable_gold; case "${enableval}" in |
| 120 | diff --git a/ld/configure.ac b/ld/configure.ac |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 121 | index 5a4938afdb0..dbbbde74b04 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 122 | --- a/ld/configure.ac |
| 123 | +++ b/ld/configure.ac |
| 124 | @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) |
| 125 | AC_SUBST(TARGET_SYSTEM_ROOT) |
| 126 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) |
| 127 | |
| 128 | +AC_ARG_ENABLE([poison-system-directories], |
| 129 | + AS_HELP_STRING([--enable-poison-system-directories], |
| 130 | + [warn for use of native system library directories]),, |
| 131 | + [enable_poison_system_directories=no]) |
| 132 | +if test "x${enable_poison_system_directories}" = "xyes"; then |
| 133 | + AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], |
| 134 | + [1], |
| 135 | + [Define to warn for use of native system library directories]) |
| 136 | +fi |
| 137 | + |
| 138 | dnl Use --enable-gold to decide if this linker should be the default. |
| 139 | dnl "install_as_default" is set to false if gold is the default linker. |
| 140 | dnl "installed_linker" is the installed BFD linker name. |
| 141 | diff --git a/ld/ld.h b/ld/ld.h |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 142 | index 1790dc81a66..73f832eb169 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 143 | --- a/ld/ld.h |
| 144 | +++ b/ld/ld.h |
| 145 | @@ -166,6 +166,14 @@ typedef struct |
| 146 | in the linker script. */ |
| 147 | bfd_boolean force_group_allocation; |
| 148 | |
| 149 | + /* If TRUE (the default) warn for uses of system directories when |
| 150 | + cross linking. */ |
| 151 | + bfd_boolean poison_system_directories; |
| 152 | + |
| 153 | + /* If TRUE (default FALSE) give an error for uses of system |
| 154 | + directories when cross linking instead of a warning. */ |
| 155 | + bfd_boolean error_poison_system_directories; |
| 156 | + |
| 157 | /* Big or little endian as set on command line. */ |
| 158 | enum endian_enum endian; |
| 159 | |
| 160 | diff --git a/ld/ld.texi b/ld/ld.texi |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 161 | index 2a93e9456ac..3eeb70607fd 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 162 | --- a/ld/ld.texi |
| 163 | +++ b/ld/ld.texi |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 164 | @@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 165 | |
| 166 | Passing @code{none} for @var{style} disables the setting from any |
| 167 | @code{--build-id} options earlier on the command line. |
| 168 | + |
| 169 | +@kindex --no-poison-system-directories |
| 170 | +@item --no-poison-system-directories |
| 171 | +Do not warn for @option{-L} options using system directories such as |
| 172 | +@file{/usr/lib} when cross linking. This option is intended for use |
| 173 | +in chroot environments when such directories contain the correct |
| 174 | +libraries for the target system rather than the host. |
| 175 | + |
| 176 | +@kindex --error-poison-system-directories |
| 177 | +@item --error-poison-system-directories |
| 178 | +Give an error instead of a warning for @option{-L} options using |
| 179 | +system directories when cross linking. |
| 180 | @end table |
| 181 | |
| 182 | @c man end |
| 183 | diff --git a/ld/ldfile.c b/ld/ldfile.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 184 | index e39170b5d94..fadc248a140 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 185 | --- a/ld/ldfile.c |
| 186 | +++ b/ld/ldfile.c |
| 187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) |
| 188 | new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); |
| 189 | else |
| 190 | new_dirs->name = xstrdup (name); |
| 191 | + |
| 192 | +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES |
| 193 | + if (command_line.poison_system_directories |
| 194 | + && ((!strncmp (name, "/lib", 4)) |
| 195 | + || (!strncmp (name, "/usr/lib", 8)) |
| 196 | + || (!strncmp (name, "/usr/local/lib", 14)) |
| 197 | + || (!strncmp (name, "/usr/X11R6/lib", 14)))) |
| 198 | + { |
| 199 | + if (command_line.error_poison_system_directories) |
| 200 | + einfo (_("%X%P: error: library search path \"%s\" is unsafe for " |
| 201 | + "cross-compilation\n"), name); |
| 202 | + else |
| 203 | + einfo (_("%P: warning: library search path \"%s\" is unsafe for " |
| 204 | + "cross-compilation\n"), name); |
| 205 | + } |
| 206 | +#endif |
| 207 | + |
| 208 | } |
| 209 | |
| 210 | /* Try to open a BFD for a lang_input_statement. */ |
| 211 | diff --git a/ld/ldlex.h b/ld/ldlex.h |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 212 | index 5ea083ebeb3..941dc5f3dc8 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 213 | --- a/ld/ldlex.h |
| 214 | +++ b/ld/ldlex.h |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 215 | @@ -155,6 +155,11 @@ enum option_values |
| 216 | OPTION_NON_CONTIGUOUS_REGIONS, |
| 217 | OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, |
| 218 | OPTION_DEPENDENCY_FILE, |
| 219 | + OPTION_CTF_VARIABLES, |
| 220 | + OPTION_NO_CTF_VARIABLES, |
| 221 | + OPTION_CTF_SHARE_TYPES, |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 222 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, |
| 223 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, |
| 224 | }; |
| 225 | |
| 226 | /* The initial parser states. */ |
| 227 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 228 | index f5c5a336320..516ba0360e2 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 229 | --- a/ld/ldmain.c |
| 230 | +++ b/ld/ldmain.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 231 | @@ -322,6 +322,8 @@ main (int argc, char **argv) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 232 | command_line.warn_mismatch = TRUE; |
| 233 | command_line.warn_search_mismatch = TRUE; |
| 234 | command_line.check_section_addresses = -1; |
| 235 | + command_line.poison_system_directories = TRUE; |
| 236 | + command_line.error_poison_system_directories = FALSE; |
| 237 | |
| 238 | /* We initialize DEMANGLING based on the environment variable |
| 239 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the |
| 240 | diff --git a/ld/lexsup.c b/ld/lexsup.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 241 | index 58c6c078325..879e7bb7658 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 242 | --- a/ld/lexsup.c |
| 243 | +++ b/ld/lexsup.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 244 | @@ -572,6 +572,26 @@ static const struct ld_option ld_options[] = |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 245 | { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, |
| 246 | '\0', NULL, N_("Do not show discarded sections in map file output"), |
| 247 | TWO_DASHES }, |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 248 | + { {"ctf-variables", no_argument, NULL, OPTION_CTF_VARIABLES}, |
| 249 | + '\0', NULL, N_("Emit names and types of static variables in CTF"), |
| 250 | + TWO_DASHES }, |
| 251 | + { {"no-ctf-variables", no_argument, NULL, OPTION_NO_CTF_VARIABLES}, |
| 252 | + '\0', NULL, N_("Do not emit names and types of static variables in CTF"), |
| 253 | + TWO_DASHES }, |
| 254 | + { {"ctf-share-types=<method>", required_argument, NULL, |
| 255 | + OPTION_CTF_SHARE_TYPES}, |
| 256 | + '\0', NULL, N_("How to share CTF types between translation units.\n" |
| 257 | + " <method> is: share-unconflicted (default),\n" |
| 258 | + " share-duplicated"), |
| 259 | + TWO_DASHES }, |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 260 | + { {"no-poison-system-directories", no_argument, NULL, |
| 261 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, |
| 262 | + '\0', NULL, N_("Do not warn for -L options using system directories"), |
| 263 | + TWO_DASHES }, |
| 264 | + { {"error-poison-system-directories", no_argument, NULL, |
| 265 | + + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, |
| 266 | + '\0', NULL, N_("Give an error for -L options using system directories"), |
| 267 | + TWO_DASHES }, |
| 268 | }; |
| 269 | |
| 270 | #define OPTION_COUNT ARRAY_SIZE (ld_options) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 271 | @@ -1632,6 +1652,13 @@ parse_args (unsigned argc, char **argv) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 272 | |
| 273 | case OPTION_PRINT_MAP_DISCARDED: |
| 274 | config.print_map_discarded = TRUE; |
| 275 | + |
| 276 | + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: |
| 277 | + command_line.poison_system_directories = FALSE; |
| 278 | + break; |
| 279 | + |
| 280 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: |
| 281 | + command_line.error_poison_system_directories = TRUE; |
| 282 | break; |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 283 | |
| 284 | case OPTION_DEPENDENCY_FILE: |
| 285 | -- |
| 286 | 2.28.0 |
| 287 | |