You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
2.0 KiB
71 lines
2.0 KiB
2011-04-04 Jakub Jelinek <jakub@redhat.com> |
|
|
|
* toplev.c (toplev_main_argv): New variable. |
|
(toplev_main): Initialize it. |
|
* graphite.c (init_isl_pointers): Load libisl.so.15 from gcc's private |
|
directory. |
|
|
|
--- gcc/toplev.c.jj 2008-12-09 23:59:10.000000000 +0100 |
|
+++ gcc/toplev.c 2009-01-27 14:33:52.000000000 +0100 |
|
@@ -117,6 +117,8 @@ static void compile_file (void); |
|
/* True if we don't need a backend (e.g. preprocessing only). */ |
|
static bool no_backend; |
|
|
|
+const char **toplev_main_argv; |
|
+ |
|
/* Decoded options, and number of such options. */ |
|
struct cl_decoded_option *save_decoded_options; |
|
unsigned int save_decoded_options_count; |
|
@@ -2287,6 +2289,8 @@ toplev::main (int argc, char **argv) |
|
|
|
expandargv (&argc, &argv); |
|
|
|
+ toplev_main_argv = CONST_CAST2 (const char **, char **, argv); |
|
+ |
|
/* Initialization of GCC's environment, and diagnostics. */ |
|
general_init (argv[0], m_init_signals); |
|
|
|
--- gcc/graphite.c.jj 2010-12-01 10:24:32.000000000 -0500 |
|
+++ gcc/graphite.c 2010-12-01 11:46:07.832118193 -0500 |
|
@@ -64,11 +64,39 @@ __typeof (isl_pointers__) isl_pointers__ |
|
static bool |
|
init_isl_pointers (void) |
|
{ |
|
- void *h; |
|
+ void *h = NULL; |
|
+ extern const char **toplev_main_argv; |
|
+ char *buf, *p; |
|
+ size_t len; |
|
|
|
if (isl_pointers__.inited) |
|
return isl_pointers__.h != NULL; |
|
- h = dlopen ("libisl.so.15", RTLD_LAZY); |
|
+ len = progname - toplev_main_argv[0]; |
|
+ buf = XALLOCAVAR (char, len + sizeof "libisl.so.15"); |
|
+ memcpy (buf, toplev_main_argv[0], len); |
|
+ strcpy (buf + len, "libisl.so.15"); |
|
+ len += sizeof "libisl.so.15"; |
|
+ p = strstr (buf, "/libexec/"); |
|
+ if (p != NULL) |
|
+ { |
|
+ while (1) |
|
+ { |
|
+ char *q = strstr (p + 8, "/libexec/"); |
|
+ if (q == NULL) |
|
+ break; |
|
+ p = q; |
|
+ } |
|
+ memmove (p + 4, p + 8, len - (p + 8 - buf)); |
|
+ h = dlopen (buf, RTLD_LAZY); |
|
+ if (h == NULL) |
|
+ { |
|
+ len = progname - toplev_main_argv[0]; |
|
+ memcpy (buf, toplev_main_argv[0], len); |
|
+ strcpy (buf + len, "libisl.so.15"); |
|
+ } |
|
+ } |
|
+ if (h == NULL) |
|
+ h = dlopen (buf, RTLD_LAZY); |
|
isl_pointers__.h = h; |
|
if (h == NULL) |
|
return false;
|
|
|