X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gcc%2Fcp%2Fg%2B%2Bspec.c;h=6c4574a837d6ea6c10549a52412a24bd0870b1ba;hb=1e2fa738e1c67c1ff7242de87a197403b35e8736;hp=8828573ef540cc26e8e54f7f22576a7692690132;hpb=66647d441f149c553f8844841f180ad047bd0edd;p=gcc.git diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c index 8828573ef54..6c4574a837d 100644 --- a/gcc/cp/g++spec.c +++ b/gcc/cp/g++spec.c @@ -1,6 +1,5 @@ /* Specific flags and argument handling of the C++ front end. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1996-2019 Free Software Foundation, Inc. This file is part of GCC. @@ -22,48 +21,55 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "gcc.h" +#include "opts.h" /* This bit is set if we saw a `-xfoo' language specification. */ #define LANGSPEC (1<<1) /* This bit is set if they did `-lm' or `-lmath'. */ #define MATHLIB (1<<2) +/* This bit is set if they did `-lrt' or equivalent. */ +#define TIMELIB (1<<3) /* This bit is set if they did `-lc'. */ -#define WITHLIBC (1<<3) +#define WITHLIBC (1<<4) +/* Skip this option. */ +#define SKIPOPT (1<<5) #ifndef MATH_LIBRARY -#define MATH_LIBRARY "-lm" +#define MATH_LIBRARY "m" #endif #ifndef MATH_LIBRARY_PROFILE #define MATH_LIBRARY_PROFILE MATH_LIBRARY #endif +#ifndef TIME_LIBRARY +#define TIME_LIBRARY "" +#endif + #ifndef LIBSTDCXX -#define LIBSTDCXX "-lstdc++" +#define LIBSTDCXX "stdc++" #endif #ifndef LIBSTDCXX_PROFILE #define LIBSTDCXX_PROFILE LIBSTDCXX #endif #ifndef LIBSTDCXX_STATIC -#define LIBSTDCXX_STATIC LIBSTDCXX +#define LIBSTDCXX_STATIC NULL #endif void -lang_specific_driver (int *in_argc, const char *const **in_argv, +lang_specific_driver (struct cl_decoded_option **in_decoded_options, + unsigned int *in_decoded_options_count, int *in_added_libraries) { - int i, j; + unsigned int i, j; /* If nonzero, the user gave us the `-p' or `-pg' flag. */ int saw_profile_flag = 0; - /* If nonzero, the user gave us the `-v' flag. */ - int saw_verbose_flag = 0; - - /* This is a tristate: + /* What do with libstdc++: -1 means we should not link in libstdc++ 0 means we should link in libstdc++ if it is needed - 1 means libstdc++ is needed and should be linked in. */ + 1 means libstdc++ is needed and should be linked in. + 2 means libstdc++ is needed and should be linked statically. */ int library = 0; /* The number of arguments being added to what's in argv, other than @@ -71,12 +77,8 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, -xc++/-xnone. */ int added = 0; - /* Used to track options that take arguments, so we don't go wrapping - those with -xc++/-xnone. */ - const char *quote = NULL; - /* The new argument list will be contained in this. */ - const char **arglist; + struct cl_decoded_option *new_decoded_options; /* Nonzero if we saw a `-xfoo' language specification on the command line. Used to avoid adding our own -xc++ if the user @@ -84,233 +86,248 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, int saw_speclang = 0; /* "-lm" or "-lmath" if it appears on the command line. */ - const char *saw_math = 0; + const struct cl_decoded_option *saw_math = NULL; + + /* "-lrt" or eqivalent if it appears on the command line. */ + const struct cl_decoded_option *saw_time = NULL; /* "-lc" if it appears on the command line. */ - const char *saw_libc = 0; + const struct cl_decoded_option *saw_libc = NULL; /* An array used to flag each argument that needs a bit set for - LANGSPEC, MATHLIB, or WITHLIBC. */ + LANGSPEC, MATHLIB, TIMELIB, or WITHLIBC. */ int *args; /* By default, we throw on the math library if we have one. */ int need_math = (MATH_LIBRARY[0] != '\0'); + /* By default, we throw on the time library if we have one. */ + int need_time = (TIME_LIBRARY[0] != '\0'); + + /* True if we saw -static. */ + int static_link = 0; + /* True if we should add -shared-libgcc to the command-line. */ int shared_libgcc = 1; /* The total number of arguments with the new stuff. */ - int argc; + unsigned int argc; /* The argument list. */ - const char *const *argv; + struct cl_decoded_option *decoded_options; /* The number of libraries added in. */ int added_libraries; /* The total number of arguments with the new stuff. */ - int num_args = 1; + unsigned int num_args = 1; - argc = *in_argc; - argv = *in_argv; + argc = *in_decoded_options_count; + decoded_options = *in_decoded_options; added_libraries = *in_added_libraries; args = XCNEWVEC (int, argc); for (i = 1; i < argc; i++) { - /* If the previous option took an argument, we swallow it here. */ - if (quote) - { - quote = NULL; - continue; - } - - /* We don't do this anymore, since we don't get them with minus - signs on them. */ - if (argv[i][0] == '\0' || argv[i][1] == '\0') - continue; + const char *arg = decoded_options[i].arg; + if (decoded_options[i].errors & CL_ERR_MISSING_ARG) + continue; /* Avoid examining arguments of options missing them. */ - if (argv[i][0] == '-') + switch (decoded_options[i].opt_index) { - if (strcmp (argv[i], "-nostdlib") == 0 - || strcmp (argv[i], "-nodefaultlibs") == 0) - { - library = -1; - } - else if (strcmp (argv[i], MATH_LIBRARY) == 0) + case OPT_nostdlib: + case OPT_nodefaultlibs: + library = -1; + break; + + case OPT_l: + if (strcmp (arg, MATH_LIBRARY) == 0) { args[i] |= MATHLIB; need_math = 0; } - else if (strcmp (argv[i], "-lc") == 0) - args[i] |= WITHLIBC; - else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0) - saw_profile_flag++; - else if (strcmp (argv[i], "-v") == 0) - saw_verbose_flag = 1; - else if (strncmp (argv[i], "-x", 2) == 0) - { - const char * arg; - if (argv[i][2] != '\0') - arg = argv[i]+2; - else if ((argv[i+1]) != NULL) - /* We need to swallow arg on next loop. */ - quote = arg = argv[i+1]; - else /* Error condition, message will be printed later. */ - arg = ""; - if (library == 0 - && (strcmp (arg, "c++") == 0 - || strcmp (arg, "c++-cpp-output") == 0 - || strcmp (arg, "objective-c++") == 0 - || strcmp (arg, "objective-c++-cpp-output") == 0)) - library = 1; - - saw_speclang = 1; - } - else if (strcmp (argv[i], "-ObjC++") == 0) - { - if (library == 0) - library = 1; - saw_speclang = 1; - } - /* Arguments that go directly to the linker might be .o files, - or something, and so might cause libstdc++ to be needed. */ - else if (strcmp (argv[i], "-Xlinker") == 0) + else if (strcmp (arg, TIME_LIBRARY) == 0) { - quote = argv[i]; - if (library == 0) - library = 1; + args[i] |= TIMELIB; + need_time = 0; } - else if (strncmp (argv[i], "-Wl,", 4) == 0) - library = (library == 0) ? 1 : library; - /* Unrecognized libraries (e.g. -lfoo) may require libstdc++. */ - else if (strncmp (argv[i], "-l", 2) == 0) - library = (library == 0) ? 1 : library; - else if (((argv[i][2] == '\0' - && strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL) - || strcmp (argv[i], "-Tdata") == 0)) - quote = argv[i]; - else if ((argv[i][2] == '\0' - && strchr ("cSEM", argv[i][1]) != NULL) - || strcmp (argv[i], "-MM") == 0 - || strcmp (argv[i], "-fsyntax-only") == 0) - { - /* Don't specify libraries if we won't link, since that would - cause a warning. */ - library = -1; - } - else if (strcmp (argv[i], "-static-libgcc") == 0 - || strcmp (argv[i], "-static") == 0) - shared_libgcc = 0; - else if (DEFAULT_WORD_SWITCH_TAKES_ARG (&argv[i][1])) - i++; + else if (strcmp (arg, "c") == 0) + args[i] |= WITHLIBC; else - /* Pass other options through. */ - continue; - } - else - { - int len; + /* Unrecognized libraries (e.g. -lfoo) may require libstdc++. */ + library = (library == 0) ? 1 : library; + break; + + case OPT_pg: + case OPT_p: + saw_profile_flag++; + break; + + case OPT_x: + if (library == 0 + && (strcmp (arg, "c++") == 0 + || strcmp (arg, "c++-cpp-output") == 0 + || strcmp (arg, "objective-c++") == 0 + || strcmp (arg, "objective-c++-cpp-output") == 0)) + library = 1; + + saw_speclang = 1; + break; - if (saw_speclang) - { - saw_speclang = 0; + case OPT_Xlinker: + case OPT_Wl_: + /* Arguments that go directly to the linker might be .o files, + or something, and so might cause libstdc++ to be needed. */ + if (library == 0) + library = 1; + break; + + case OPT_c: + case OPT_r: + case OPT_S: + case OPT_E: + case OPT_M: + case OPT_MM: + case OPT_fsyntax_only: + /* Don't specify libraries if we won't link, since that would + cause a warning. */ + library = -1; + break; + + case OPT_static: + static_link = 1; + break; + + case OPT_static_libgcc: + shared_libgcc = 0; + break; + + case OPT_static_libstdc__: + library = library >= 0 ? 2 : library; + args[i] |= SKIPOPT; + break; + + case OPT_SPECIAL_input_file: + { + int len; + + /* We don't do this anymore, since we don't get them with minus + signs on them. */ + if (arg[0] == '\0' || arg[1] == '\0') continue; - } - - /* If the filename ends in .[chi], put options around it. - But not if a specified -x option is currently active. */ - len = strlen (argv[i]); - if (len > 2 - && (argv[i][len - 1] == 'c' - || argv[i][len - 1] == 'i' - || argv[i][len - 1] == 'h') - && argv[i][len - 2] == '.') - { - args[i] |= LANGSPEC; - added += 2; - } - /* If we don't know that this is a header file, we might - need to be linking in the libraries. */ - if (library == 0) - { - if ((len <= 2 || strcmp (argv[i] + (len - 2), ".H") != 0) - && (len <= 2 || strcmp (argv[i] + (len - 2), ".h") != 0) - && (len <= 4 || strcmp (argv[i] + (len - 4), ".hpp") != 0) - && (len <= 3 || strcmp (argv[i] + (len - 3), ".hp") != 0) - && (len <= 4 || strcmp (argv[i] + (len - 4), ".hxx") != 0) - && (len <= 4 || strcmp (argv[i] + (len - 4), ".h++") != 0) - && (len <= 4 || strcmp (argv[i] + (len - 4), ".HPP") != 0) - && (len <= 4 || strcmp (argv[i] + (len - 4), ".tcc") != 0) - && (len <= 3 || strcmp (argv[i] + (len - 3), ".hh") != 0)) - library = 1; - } + if (saw_speclang) + { + saw_speclang = 0; + continue; + } + + /* If the filename ends in .[chi], put options around it. + But not if a specified -x option is currently active. */ + len = strlen (arg); + if (len > 2 + && (arg[len - 1] == 'c' + || arg[len - 1] == 'i' + || arg[len - 1] == 'h') + && arg[len - 2] == '.') + { + args[i] |= LANGSPEC; + added += 2; + } + + /* If we don't know that this is a header file, we might + need to be linking in the libraries. */ + if (library == 0) + { + if ((len <= 2 || strcmp (arg + (len - 2), ".H") != 0) + && (len <= 2 || strcmp (arg + (len - 2), ".h") != 0) + && (len <= 4 || strcmp (arg + (len - 4), ".hpp") != 0) + && (len <= 3 || strcmp (arg + (len - 3), ".hp") != 0) + && (len <= 4 || strcmp (arg + (len - 4), ".hxx") != 0) + && (len <= 4 || strcmp (arg + (len - 4), ".h++") != 0) + && (len <= 4 || strcmp (arg + (len - 4), ".HPP") != 0) + && (len <= 4 || strcmp (arg + (len - 4), ".tcc") != 0) + && (len <= 3 || strcmp (arg + (len - 3), ".hh") != 0)) + library = 1; + } + } + break; } } - if (quote) - fatal ("argument to '%s' missing\n", quote); - /* There's no point adding -shared-libgcc if we don't have a shared libgcc. */ #ifndef ENABLE_SHARED_LIBGCC shared_libgcc = 0; #endif - /* Make sure to have room for the trailing NULL argument. */ - num_args = argc + added + need_math + shared_libgcc + (library > 0) + 1; - arglist = XNEWVEC (const char *, num_args); + /* Add one for shared_libgcc or extra static library. */ + num_args = argc + added + need_math + (library > 0) * 4 + 1; + new_decoded_options = XNEWVEC (struct cl_decoded_option, num_args); i = 0; j = 0; /* Copy the 0th argument, i.e., the name of the program itself. */ - arglist[i++] = argv[j++]; + new_decoded_options[j++] = decoded_options[i++]; /* NOTE: We start at 1 now, not 0. */ while (i < argc) { - arglist[j] = argv[i]; + new_decoded_options[j] = decoded_options[i]; /* Make sure -lstdc++ is before the math library, since libstdc++ itself uses those math routines. */ if (!saw_math && (args[i] & MATHLIB) && library > 0) { --j; - saw_math = argv[i]; + saw_math = &decoded_options[i]; + } + + if (!saw_time && (args[i] & TIMELIB) && library > 0) + { + --j; + saw_time = &decoded_options[i]; } if (!saw_libc && (args[i] & WITHLIBC) && library > 0) { --j; - saw_libc = argv[i]; + saw_libc = &decoded_options[i]; } /* Wrap foo.[chi] files in a language specification to force the gcc compiler driver to run cc1plus on them. */ if (args[i] & LANGSPEC) { - int len = strlen (argv[i]); - switch (argv[i][len - 1]) + const char *arg = decoded_options[i].arg; + int len = strlen (arg); + switch (arg[len - 1]) { case 'c': - arglist[j++] = "-xc++"; + generate_option (OPT_x, "c++", 1, CL_DRIVER, + &new_decoded_options[j++]); break; case 'i': - arglist[j++] = "-xc++-cpp-output"; + generate_option (OPT_x, "c++-cpp-output", 1, CL_DRIVER, + &new_decoded_options[j++]); break; case 'h': - arglist[j++] = "-xc++-header"; + generate_option (OPT_x, "c++-header", 1, CL_DRIVER, + &new_decoded_options[j++]); break; default: gcc_unreachable (); } - arglist[j++] = argv[i]; - arglist[j] = "-xnone"; + new_decoded_options[j++] = decoded_options[i]; + generate_option (OPT_x, "none", 1, CL_DRIVER, + &new_decoded_options[j]); } + if ((args[i] & SKIPOPT) != 0) + --j; + i++; j++; } @@ -318,30 +335,63 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, /* Add `-lstdc++' if we haven't already done so. */ if (library > 0) { - arglist[j] = shared_libgcc == 0 ? LIBSTDCXX_STATIC - : saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; - if (arglist[j][0] != '-' || arglist[j][1] == 'l') - added_libraries++; +#ifdef HAVE_LD_STATIC_DYNAMIC + if (library > 1 && !static_link) + { + generate_option (OPT_Wl_, LD_STATIC_OPTION, 1, CL_DRIVER, + &new_decoded_options[j]); + j++; + } +#endif + generate_option (OPT_l, + saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX, 1, + CL_DRIVER, &new_decoded_options[j]); + added_libraries++; j++; + /* Add target-dependent static library, if necessary. */ + if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL) + { + generate_option (OPT_l, LIBSTDCXX_STATIC, 1, + CL_DRIVER, &new_decoded_options[j]); + added_libraries++; + j++; + } +#ifdef HAVE_LD_STATIC_DYNAMIC + if (library > 1 && !static_link) + { + generate_option (OPT_Wl_, LD_DYNAMIC_OPTION, 1, CL_DRIVER, + &new_decoded_options[j]); + j++; + } +#endif } if (saw_math) - arglist[j++] = saw_math; + new_decoded_options[j++] = *saw_math; else if (library > 0 && need_math) { - arglist[j] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; - if (arglist[j][0] != '-' || arglist[j][1] == 'l') - added_libraries++; + generate_option (OPT_l, + saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY, + 1, CL_DRIVER, &new_decoded_options[j]); + added_libraries++; + j++; + } + if (saw_time) + new_decoded_options[j++] = *saw_time; + else if (library > 0 && need_time) + { + generate_option (OPT_l, TIME_LIBRARY, 1, CL_DRIVER, + &new_decoded_options[j]); + added_libraries++; j++; } if (saw_libc) - arglist[j++] = saw_libc; - if (shared_libgcc) - arglist[j++] = "-shared-libgcc"; - - arglist[j] = NULL; + new_decoded_options[j++] = *saw_libc; + if (shared_libgcc && !static_link) + generate_option (OPT_shared_libgcc, NULL, 1, CL_DRIVER, + &new_decoded_options[j++]); - *in_argc = j; - *in_argv = arglist; + *in_decoded_options_count = j; + *in_decoded_options = new_decoded_options; *in_added_libraries = added_libraries; }