diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 0add2f0a9ae..b334136cab8 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -3b8a505824abb2a69f4c04c555a4ba29ab8b102b +ca0fdb4c7735a648b8f10f1248631adf9afb8454 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/import.cc b/gcc/go/gofrontend/import.cc index 64c1ef2d9e3..bbc8d7d9930 100644 --- a/gcc/go/gofrontend/import.cc +++ b/gcc/go/gofrontend/import.cc @@ -777,7 +777,7 @@ Import::import_var() this->location_); Named_object* no; no = vpkg->add_variable(name, var); - if (this->add_to_globals_) + if (this->add_to_globals_ && vpkg == this->package_) this->gogo_->add_dot_import_object(no); }