diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
| commit | 43269d882367dc4f0e4c2651d6625e1b7de78764 (patch) | |
| tree | 6aaf525a6fb8a4fb63a71c9ca56be58bc1d6655b /gcc/go/gofrontend/go.cc | |
| parent | ce97ec0e268b7b50b9f801dd12ffc67042c47193 (diff) | |
| parent | 48dc1117de124a2265129a36bfbbc211522c2c02 (diff) | |
| download | gcc-hjl/tsx/gcc-4_7-branch.tar.gz | |
Merge remote-tracking branch 'origin/gcc-4_7-branch' into hjl/tsx/gcc-4_7-branchhjl/tsx/gcc-4_7-branch
Conflicts:
gcc/config/i386/driver-i386.c
gcc/config/i386/i386.c
gcc/config/i386/sync.md
Diffstat (limited to 'gcc/go/gofrontend/go.cc')
| -rw-r--r-- | gcc/go/gofrontend/go.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/go.cc b/gcc/go/gofrontend/go.cc index 1f2ce8adcde..11692af8095 100644 --- a/gcc/go/gofrontend/go.cc +++ b/gcc/go/gofrontend/go.cc @@ -21,7 +21,7 @@ static Gogo* gogo; GO_EXTERN_C void go_create_gogo(int int_type_size, int pointer_size, const char *pkgpath, - const char *prefix) + const char *prefix, const char *relative_import_path) { go_assert(::gogo == NULL); Linemap* linemap = go_get_linemap(); @@ -32,6 +32,9 @@ go_create_gogo(int int_type_size, int pointer_size, const char *pkgpath, else if (prefix != NULL) ::gogo->set_prefix(prefix); + if (relative_import_path != NULL) + ::gogo->set_relative_import_path(relative_import_path); + // FIXME: This should be in the gcc dependent code. ::gogo->define_builtin_function_trees(); } |