diff options
author | Andi Kleen <ak@linux.intel.com> | 2014-09-01 16:41:17 +0000 |
---|---|---|
committer | Andi Kleen <ak@gcc.gnu.org> | 2014-09-01 16:41:17 +0000 |
commit | b5617e5f69bdd5ad7a3da9b34d1871fb2aff940a (patch) | |
tree | 002ff8316f4430d4d2d699fc668daaa5256ff01a /gcc/gcc-ar.c | |
parent | fc4f981d25a2b03e6c15303d531c272689c71187 (diff) |
Add -B support to gcc-ar/ranlib/nm
To use gcc-{ar,ranlib} for boot strap we need to add a -B option
to the tool. Since ar has weird and unusual argument conventions
implement the code by hand instead of using any libraries.
gcc/:
2014-09-01 Andi Kleen <ak@linux.intel.com>
* file-find.c (add_prefix_begin): Add.
(do_add_prefix): Rename from add_prefix with first argument.
(add_prefix): Add new wrapper.
* file-find.h (add_prefix_begin): Add.
* gcc-ar.c (main): Support -B option.
From-SVN: r214800
Diffstat (limited to 'gcc/gcc-ar.c')
-rw-r--r-- | gcc/gcc-ar.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c index aebaa92bf1d..fdff89c643f 100644 --- a/gcc/gcc-ar.c +++ b/gcc/gcc-ar.c @@ -132,9 +132,52 @@ main (int ac, char **av) const char **nargv; bool is_ar = !strcmp (PERSONALITY, "ar"); int exit_code = FATAL_EXIT_CODE; + int i; setup_prefixes (av[0]); + /* Not using getopt for now. */ + for (i = 0; i < ac; i++) + if (!strncmp (av[i], "-B", 2)) + { + const char *arg = av[i] + 2; + const char *end; + size_t len; + + memmove (av + i, av + i + 1, sizeof (char *) * ((ac + 1) - i)); + ac--; + if (*arg == 0) + { + arg = av[i]; + if (!arg) + { + fprintf (stderr, "Usage: gcc-ar [-B prefix] ar arguments ...\n"); + exit (EXIT_FAILURE); + } + memmove (av + i, av + i + 1, sizeof (char *) * ((ac + 1) - i)); + ac--; + i++; + } + /* else it's a joined argument */ + + len = strlen (arg); + if (len > 0) + len--; + end = arg + len; + + /* Always add a dir separator for the prefix list. */ + if (end > arg && !IS_DIR_SEPARATOR (*end)) + { + static const char dir_separator_str[] = { DIR_SEPARATOR, 0 }; + arg = concat (arg, dir_separator_str, NULL); + } + + add_prefix_begin (&path, arg); + add_prefix_begin (&target_path, arg); + break; + } + + /* Find the GCC LTO plugin */ plugin = find_a_file (&target_path, LTOPLUGINSONAME, R_OK); if (!plugin) |