diff options
Diffstat (limited to 'contrib/gcc/cp/g++spec.c')
| -rw-r--r-- | contrib/gcc/cp/g++spec.c | 133 |
1 files changed, 77 insertions, 56 deletions
diff --git a/contrib/gcc/cp/g++spec.c b/contrib/gcc/cp/g++spec.c index af30f1c..e6c9ee6 100644 --- a/contrib/gcc/cp/g++spec.c +++ b/contrib/gcc/cp/g++spec.c @@ -1,25 +1,28 @@ /* Specific flags and argument handling of the C++ front-end. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "gcc.h" /* This bit is set if we saw a `-xfoo' language specification. */ @@ -44,10 +47,8 @@ Boston, MA 02111-1307, USA. */ #endif void -lang_specific_driver (in_argc, in_argv, in_added_libraries) - int *in_argc; - const char *const **in_argv; - int *in_added_libraries; +lang_specific_driver (int *in_argc, const char *const **in_argv, + int *in_added_libraries) { int i, j; @@ -57,14 +58,16 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) /* If nonzero, the user gave us the `-v' flag. */ int saw_verbose_flag = 0; - /* This will be 0 if we encounter a situation where we should not - link in libstdc++. */ - int library = 1; + /* This is a tristate: + -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. */ + int library = 0; /* The number of arguments being added to what's in argv, other than libraries. We use this to track the number of times we've inserted -xc++/-xnone. */ - int added = 2; + int added = 0; /* Used to track options that take arguments, so we don't go wrapping those with -xc++/-xnone. */ @@ -110,7 +113,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) argv = *in_argv; added_libraries = *in_added_libraries; - args = (int *) xcalloc (argc, sizeof (int)); + args = xcalloc (argc, sizeof (int)); for (i = 1; i < argc; i++) { @@ -128,17 +131,14 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) if (argv[i][0] == '-') { - if (library != 0 && (strcmp (argv[i], "-nostdlib") == 0 - || strcmp (argv[i], "-nodefaultlibs") == 0)) + if (strcmp (argv[i], "-nostdlib") == 0 + || strcmp (argv[i], "-nodefaultlibs") == 0) { - library = 0; + library = -1; } else if (strcmp (argv[i], "-lm") == 0 || strcmp (argv[i], "-lmath") == 0 || strcmp (argv[i], MATH_LIBRARY) == 0 -#ifdef ALT_LIBM - || strcmp (argv[i], ALT_LIBM) == 0 -#endif ) { args[i] |= MATHLIB; @@ -149,31 +149,37 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) 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) { - saw_verbose_flag = 1; - if (argc == 2) + if (library == 0) { - /* If they only gave us `-v', don't try to link - in libg++. */ - library = 0; + const char * arg; + if (argv[i][2] != '\0') + arg = argv[i]+2; + else if (argv[i+1] != NULL) + arg = argv[i+1]; + else /* Error condition, message will be printed later. */ + arg = ""; + if (strcmp (arg, "c++") == 0 + || strcmp (arg, "c++-cpp-output") == 0) + library = 1; } + saw_speclang = 1; } - else if (strncmp (argv[i], "-x", 2) == 0) - saw_speclang = 1; else if (((argv[i][2] == '\0' - && (char *)strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL) + && strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL) || strcmp (argv[i], "-Xlinker") == 0 || strcmp (argv[i], "-Tdata") == 0)) quote = argv[i]; - else if (library != 0 && ((argv[i][2] == '\0' - && (char *) strchr ("cSEM", argv[i][1]) != NULL) - || strcmp (argv[i], "-MM") == 0 - || strcmp (argv[i], "-fsyntax-only") == 0)) + 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 = 0; - added -= 2; + library = -1; } else if (strcmp (argv[i], "-static-libgcc") == 0 || strcmp (argv[i], "-static") == 0) @@ -194,16 +200,28 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) continue; } - /* If the filename ends in .c or .i, put options around it. + /* 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] == '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 <= 3 || strcmp (argv[i] + (len - 3), ".hh") != 0)) + library = 1; + } } } @@ -211,7 +229,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) fatal ("argument to `%s' missing\n", quote); /* If we know we don't have to do anything, bail now. */ - if (! added && ! library) + if (! added && library <= 0) { free (args); return; @@ -224,8 +242,8 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) #endif /* Make sure to have room for the trailing NULL argument. */ - num_args = argc + added + need_math + shared_libgcc + 1; - arglist = (const char **) xmalloc (num_args * sizeof (char *)); + num_args = argc + added + need_math + shared_libgcc + (library > 0) + 1; + arglist = xmalloc (num_args * sizeof (char *)); i = 0; j = 0; @@ -240,27 +258,37 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) /* Make sure -lstdc++ is before the math library, since libstdc++ itself uses those math routines. */ - if (!saw_math && (args[i] & MATHLIB) && library) + if (!saw_math && (args[i] & MATHLIB) && library > 0) { --j; saw_math = argv[i]; } - if (!saw_libc && (args[i] & WITHLIBC) && library) + if (!saw_libc && (args[i] & WITHLIBC) && library > 0) { --j; saw_libc = argv[i]; } - /* Wrap foo.c and foo.i files in a language specification to + /* 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]); - if (argv[i][len - 1] == 'i') - arglist[j++] = "-xc++-cpp-output"; - else - arglist[j++] = "-xc++"; + switch (argv[i][len - 1]) + { + case 'c': + arglist[j++] = "-xc++"; + break; + case 'i': + arglist[j++] = "-xc++-cpp-output"; + break; + case 'h': + arglist[j++] = "-xc++-header"; + break; + default: + abort (); + } arglist[j++] = argv[i]; arglist[j] = "-xnone"; } @@ -270,21 +298,14 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) } /* Add `-lstdc++' if we haven't already done so. */ - if (library) + if (library > 0) { arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; added_libraries++; -#ifdef USE_LIBUNWIND_EXCEPTIONS -# ifndef LIBUNWIND -# define LIBUNWIND "-lunwind" -# endif - arglist[j++] = LIBUNWIND; - added_libraries++; -#endif } if (saw_math) arglist[j++] = saw_math; - else if (library && need_math) + else if (library > 0 && need_math) { arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; added_libraries++; @@ -302,7 +323,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) } /* Called before linking. Returns 0 on success and -1 on failure. */ -int lang_specific_pre_link () /* Not used for C++. */ +int lang_specific_pre_link (void) /* Not used for C++. */ { return 0; } |
