X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fcp%2Fg%2B%2Bspec.c;h=28530880eb682f06b6ed6d598d4cacde13841cf7;hp=d3407a31604474021ba2bec14883922c012dcb30;hb=ca86b3fb1262b722074bd456bdbea1fa764a5a37;hpb=6edf18a6cb88793eb51776264f367e8880b77bd2 diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c index d3407a31604..28530880eb6 100644 --- a/gcc/cp/g++spec.c +++ b/gcc/cp/g++spec.c @@ -1,12 +1,12 @@ -/* Specific flags and argument handling of the C++ front-end. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. +/* Specific flags and argument handling of the C++ front end. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. 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) +the Free Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, @@ -15,9 +15,8 @@ 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 GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" @@ -31,19 +30,24 @@ Boston, MA 02111-1307, USA. */ #define MATHLIB (1<<2) /* This bit is set if they did `-lc'. */ #define WITHLIBC (1<<3) +/* Skip this option. */ +#define SKIPOPT (1<<4) #ifndef MATH_LIBRARY #define MATH_LIBRARY "-lm" #endif #ifndef MATH_LIBRARY_PROFILE -#define MATH_LIBRARY_PROFILE "-lm" +#define MATH_LIBRARY_PROFILE MATH_LIBRARY #endif #ifndef LIBSTDCXX #define LIBSTDCXX "-lstdc++" #endif #ifndef LIBSTDCXX_PROFILE -#define LIBSTDCXX_PROFILE "-lstdc++" +#define LIBSTDCXX_PROFILE LIBSTDCXX +#endif +#ifndef LIBSTDCXX_STATIC +#define LIBSTDCXX_STATIC NULL #endif void @@ -55,13 +59,11 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, /* 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 @@ -94,6 +96,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, /* By default, we throw on the math library if we have one. */ int need_math = (MATH_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; @@ -113,7 +118,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, argv = *in_argv; added_libraries = *in_added_libraries; - args = xcalloc (argc, sizeof (int)); + args = XCNEWVEC (int, argc); for (i = 1; i < argc; i++) { @@ -136,10 +141,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, { library = -1; } - else if (strcmp (argv[i], "-lm") == 0 - || strcmp (argv[i], "-lmath") == 0 - || strcmp (argv[i], MATH_LIBRARY) == 0 - ) + else if (strcmp (argv[i], MATH_LIBRARY) == 0) { args[i] |= MATHLIB; need_math = 0; @@ -148,28 +150,46 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, 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) - { - 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; - } + 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) + { + quote = argv[i]; + if (library == 0) + library = 1; + } + 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], "-Xlinker") == 0 || strcmp (argv[i], "-Tdata") == 0)) quote = argv[i]; else if ((argv[i][2] == '\0' @@ -181,9 +201,15 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, cause a warning. */ library = -1; } - else if (strcmp (argv[i], "-static-libgcc") == 0 - || strcmp (argv[i], "-static") == 0) + else if (strcmp (argv[i], "-static") == 0) + static_link = 1; + else if (strcmp (argv[i], "-static-libgcc") == 0) shared_libgcc = 0; + else if (strcmp (argv[i], "-static-libstdc++") == 0) + { + library = library >= 0 ? 2 : library; + args[i] |= SKIPOPT; + } else if (DEFAULT_WORD_SWITCH_TAKES_ARG (&argv[i][1])) i++; else @@ -192,7 +218,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, } else { - int len; + int len; if (saw_speclang) { @@ -204,7 +230,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, 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] == 'c' || argv[i][len - 1] == 'i' || argv[i][len - 1] == 'h') && argv[i][len - 2] == '.') @@ -212,13 +238,19 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, 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; } @@ -226,14 +258,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, } if (quote) - fatal ("argument to `%s' missing\n", quote); - - /* If we know we don't have to do anything, bail now. */ - if (! added && library <= 0) - { - free (args); - return; - } + fatal ("argument to '%s' missing\n", quote); /* There's no point adding -shared-libgcc if we don't have a shared libgcc. */ @@ -241,13 +266,14 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, 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 = xmalloc (num_args * sizeof (char *)); + /* Make sure to have room for the trailing NULL argument. + Add one for shared_libgcc or extra static library. */ + num_args = argc + added + need_math + (library > 0) * 4 + 2; + arglist = XNEWVEC (const char *, num_args); i = 0; j = 0; - + /* Copy the 0th argument, i.e., the name of the program itself. */ arglist[i++] = argv[j++]; @@ -287,12 +313,15 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, arglist[j++] = "-xc++-header"; break; default: - abort (); + gcc_unreachable (); } arglist[j++] = argv[i]; arglist[j] = "-xnone"; } + if ((args[i] & SKIPOPT) != 0) + --j; + i++; j++; } @@ -300,26 +329,45 @@ 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++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; - added_libraries++; -#ifdef USE_LIBUNWIND_EXCEPTIONS -# ifndef LIBUNWIND -# define LIBUNWIND "-lunwind" -# endif - arglist[j++] = LIBUNWIND; - added_libraries++; +#ifdef HAVE_LD_STATIC_DYNAMIC + if (library > 1 && !static_link) + { + arglist[j] = "-Wl,-Bstatic"; + j++; + } +#endif + arglist[j] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; + if (arglist[j][0] != '-' || arglist[j][1] == 'l') + added_libraries++; + j++; + /* Add target-dependent static library, if necessary. */ + if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL) + { + arglist[j] = LIBSTDCXX_STATIC; + if (arglist[j][0] != '-' || arglist[j][1] == 'l') + added_libraries++; + j++; + } +#ifdef HAVE_LD_STATIC_DYNAMIC + if (library > 1 && !static_link) + { + arglist[j] = "-Wl,-Bdynamic"; + j++; + } #endif } if (saw_math) arglist[j++] = saw_math; else if (library > 0 && need_math) { - arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; - added_libraries++; + arglist[j] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; + if (arglist[j][0] != '-' || arglist[j][1] == 'l') + added_libraries++; + j++; } if (saw_libc) arglist[j++] = saw_libc; - if (shared_libgcc) + if (shared_libgcc && !static_link) arglist[j++] = "-shared-libgcc"; arglist[j] = NULL; @@ -330,16 +378,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, } /* 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; } /* Number of extra output files that lang_specific_pre_link may generate. */ int lang_specific_extra_outfiles = 0; /* Not used for C++. */ - -/* Table of language-specific spec functions. */ -const struct spec_function lang_specific_spec_functions[] = -{ - { 0, 0 } -};