+2007-06-28 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ PR other/31400
+ * lang.opt (static-libgfortran): New option.
+ * gfortranspec.c (ADD_ARG_LIBGFORTRAN): New macro.
+ (Option): Add OPTION_static and OPTION_static_libgfortran.
+ (lookup_option): Handle the new -static-libgfortran option.
+ (lang_specific_driver): Check whether -static is passed.
+ Handle the new -static-libgfortran option.
+ * options.c (gfc_handle_option): If -static-libgfortran is
+ passed and isn't supported on this configuration, error out.
+
2007-06-27 Daniel Franke <franke.daniel@gmail.com>
PR fortran/32467
#define FORTRAN_LIBRARY "-lgfortran"
#endif
+#ifdef HAVE_LD_STATIC_DYNAMIC
+#define ADD_ARG_LIBGFORTRAN(arg) \
+ { \
+ if (static_lib && !static_linking) \
+ append_arg ("-Wl,-Bstatic"); \
+ append_arg (arg); \
+ if (static_lib && !static_linking) \
+ append_arg ("-Wl,-Bdynamic"); \
+ }
+#else
+#define ADD_ARG_LIBGFORTRAN(arg) append_arg (arg);
+#endif
+
+
/* Options this driver needs to recognize, not just know how to
skip over. */
typedef enum
-nodefaultlibs. */
OPTION_o, /* Aka --output. */
OPTION_S, /* Aka --assemble. */
+ OPTION_static, /* -static. */
+ OPTION_static_libgfortran, /* -static-libgfortran. */
OPTION_syntax_only, /* -fsyntax-only. */
OPTION_v, /* Aka --verbose. */
OPTION_version, /* --version. */
opt = OPTION_nostdlib;
else if (!strcmp (text, "-fsyntax-only"))
opt = OPTION_syntax_only;
+ else if (!strcmp (text, "-static-libgfortran"))
+ opt = OPTION_static_libgfortran;
else if (!strcmp (text, "-dumpversion"))
opt = OPTION_version;
else if (!strcmp (text, "-fversion")) /* Really --version!! */
/* By default, we throw on the math library if we have one. */
int need_math = (MATH_LIBRARY[0] != '\0');
+ /* Whether we should link a static libgfortran. */
+ int static_lib = 0;
+
+ /* Whether we need to link statically. */
+ int static_linking = 0;
+
/* The number of input and output files in the incoming arg list. */
int n_infiles = 0;
int n_outfiles = 0;
library = 0;
break;
+ case OPTION_static_libgfortran:
+ static_lib = 1;
+ break;
+
+ case OPTION_static:
+ static_linking = 1;
+
case OPTION_l:
++n_infiles;
break;
append_arg (FORTRAN_INIT);
use_init = 1;
}
- append_arg (FORTRAN_LIBRARY);
+
+ ADD_ARG_LIBGFORTRAN (FORTRAN_LIBRARY);
}
}
else if (strcmp (argv[i], FORTRAN_LIBRARY) == 0)
- saw_library = 1; /* -l<library>. */
+ {
+ saw_library = 1; /* -l<library>. */
+ ADD_ARG_LIBGFORTRAN (argv[i]);
+ continue;
+ }
else
{ /* Other library, or filename. */
if (saw_library == 1 && need_math)
append_arg (FORTRAN_INIT);
use_init = 1;
}
- append_arg (library);
+ ADD_ARG_LIBGFORTRAN (library);
+ /* Fall through. */
+
case 1:
if (need_math)
append_arg (MATH_LIBRARY);
switches[n_switches].live_cond = SWITCH_OK;
switches[n_switches].validated = 0;
switches[n_switches].ordering = 0;
- /* These are always valid, since gcc.c itself understands them. */
+ /* These are always valid, since gcc.c itself understands the
+ first four and gfortranspec.c understands -static-libgfortran. */
if (!strcmp (p, "save-temps")
|| !strcmp (p, "static-libgcc")
|| !strcmp (p, "shared-libgcc")
- || !strcmp (p, "pipe"))
+ || !strcmp (p, "pipe")
+ || !strcmp (p, "static-libgfortran"))
switches[n_switches].validated = 1;
else
{