2009-06-16 David Edelsohn <edelsohn@gnu.org>
+ * config/rs6000/aix.h (LIBSTDCXX_STATIC): Remove -lstdc++.
+
+2009-06-16 David Edelsohn <edelsohn@gnu.org>
+
* doc/install.texi (*-*-aix): Update explanation of XLC bootstrap.
GCC can bootstrap on AIX with GNU Binutils 2.20.
%{p:-L%R/lib/profiled -L%R/usr/lib/profiled} %{!shared:%{g*:-lg}} -lc"
/* Static linking with shared libstdc++ requires libsupc++ as well. */
-#define LIBSTDCXX_STATIC "-lstdc++ -lsupc++"
+#define LIBSTDCXX_STATIC "-lsupc++"
/* This now supports a natural alignment mode. */
/* AIX word-aligns FP doubles but doubleword-aligns 64-bit ints. */
+2009-06-16 David Edelsohn <edelsohn@gnu.org>
+
+ * g++-spec.c (LIBSTDCXX_STATIC): Default to NULL.
+ (lang_specific_driver): Always allocate extra argument.
+ Add LIBSTDCXX_STATIC to arglist if defined and linking
+ statically.
+
2009-06-16 Ian Lance Taylor <iant@google.com>
* Make-lang.in (cp/class.o): Depend upon gt-cp-class.h.
#define LIBSTDCXX_PROFILE LIBSTDCXX
#endif
#ifndef LIBSTDCXX_STATIC
-#define LIBSTDCXX_STATIC LIBSTDCXX
+#define LIBSTDCXX_STATIC NULL
#endif
void
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;
+ /* 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) + 2;
arglist = XNEWVEC (const char *, num_args);
i = 0;
/* 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;
+ 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 (shared_libgcc == 0 && LIBSTDCXX_STATIC != NULL)
+ {
+ arglist[j] = LIBSTDCXX_STATIC;
if (arglist[j][0] != '-' || arglist[j][1] == 'l')
added_libraries++;
j++;