diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 749e523e7df..e997df8f36f 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -74533ed435a1a77e6f9ec8f6cf5db1695c2568e8 +08f1c400ec95d70a5cf5a08b1600fa5445e42361 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/Makefile.am b/libgo/Makefile.am index aeaa203ce5a..1201cf59633 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -13,6 +13,12 @@ if LIBGO_IS_RTEMS subdirs = testsuite endif +if LIBGO_IS_DARWIN +GO_EXPORT_SECTION_NAME = __GNU_GO.__go_export +else +GO_EXPORT_SECTION_NAME = .go_export +endif + SUBDIRS = ${subdirs} gcc_version := $(shell $(GOC) -dumpversion) @@ -818,7 +824,7 @@ BUILDGOX = \ if test ! -f $$f; then \ f="$(basename $(