diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-28 01:01:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-28 01:01:46 +0000 |
| commit | b0cf10e423144652be05382cc89670bd366cb65b (patch) | |
| tree | 7045b7e6073bc50d5d84ac5a57decfa3061cfa8f | |
| parent | d0cdfae5ed74f7c79fd702b1d8b484f97dce041d (diff) | |
| download | gcc-b0cf10e423144652be05382cc89670bd366cb65b.zip gcc-b0cf10e423144652be05382cc89670bd366cb65b.tar.gz gcc-b0cf10e423144652be05382cc89670bd366cb65b.tar.bz2 | |
libgo: fix go_export extraction on Darwin
On Darwin, the section name is prefixed with the segment name, __GNU_GO.
Reviewed-on: https://go-review.googlesource.com/c/151097
From-SVN: r269271
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 8 | ||||
| -rw-r--r-- | libgo/Makefile.in | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 749e523..e997df8 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 aeaa203..1201cf5 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 $(<D)/.libs/$(<F)).o"; \ fi; \ - $(OBJCOPY) -j .go_export $$f $@.tmp; \ + $(OBJCOPY) -j $(GO_EXPORT_SECTION_NAME) $$f $@.tmp; \ $(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'` GOTESTFLAGS = diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 7f39891..346683b 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -529,6 +529,8 @@ top_srcdir = @top_srcdir@ # Go support. SUFFIXES = .c .go .gox .o .obj .lo .a @LIBGO_IS_RTEMS_TRUE@subdirs = testsuite +@LIBGO_IS_DARWIN_FALSE@GO_EXPORT_SECTION_NAME = .go_export +@LIBGO_IS_DARWIN_TRUE@GO_EXPORT_SECTION_NAME = __GNU_GO.__go_export SUBDIRS = ${subdirs} gcc_version := $(shell $(GOC) -dumpversion) MAINT_CHARSET = latin1 @@ -1001,7 +1003,7 @@ BUILDGOX = \ if test ! -f $$f; then \ f="$(basename $(<D)/.libs/$(<F)).o"; \ fi; \ - $(OBJCOPY) -j .go_export $$f $@.tmp; \ + $(OBJCOPY) -j $(GO_EXPORT_SECTION_NAME) $$f $@.tmp; \ $(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'` GOTESTFLAGS = |