aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jvspec.c13
2 files changed, 18 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d1728f8..81970f5 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16 Jakub Jelinek <jakub@redhat.com>
+ Bryce McKinlay <bryce@mckinlay.net.nz>
+
+ * jvspec.c (lang_specific_driver): Add -s-bc-abi when needed.
+
2006-08-10 Simon Martin <simartin@users.sourceforge.net>
PR java/8923
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index 63f49ff..f64d4388 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -243,6 +243,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
/* The argument we use to specify the spec file. */
char *spec_file = NULL;
+ /* If linking, nonzero if the BC-ABI is in use. */
+ int link_for_bc_abi = 0;
+
argc = *in_argc;
argv = *in_argv;
added_libraries = *in_added_libraries;
@@ -365,6 +368,11 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
else if (strcmp (argv[i], "-static-libgcc") == 0
|| strcmp (argv[i], "-static") == 0)
shared_libgcc = 0;
+ else if (strcmp (argv[i], "-findirect-dispatch") == 0
+ || strcmp (argv[i], "--indirect-dispatch") == 0)
+ {
+ link_for_bc_abi = 1;
+ }
else
/* Pass other options through. */
continue;
@@ -490,6 +498,8 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
num_args += shared_libgcc;
+ num_args += link_for_bc_abi;
+
arglist = XNEWVEC (const char *, num_args + 1);
j = 0;
@@ -599,6 +609,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
if (shared_libgcc)
arglist[j++] = "-shared-libgcc";
+ if (link_for_bc_abi)
+ arglist[j++] = "-s-bc-abi";
+
arglist[j] = NULL;
*in_argc = j;