diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-18 14:28:24 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-18 14:28:24 +0000 |
| commit | d64d3175bf55a6776c4c7dabd623b7c4a62fdb3b (patch) | |
| tree | 6b6b9c9d00ac2d0024524cb1e632b9a8d05cbcdd /libgo/Makefile.am | |
| parent | 2b32a97f2518231b91c28cccf9bb067b73b78059 (diff) | |
| download | gcc-d64d3175bf55a6776c4c7dabd623b7c4a62fdb3b.tar.gz | |
libgo: Link against libatomic.
./:
PR go/55201
* Makefile.def (all-target-libgo): Depend on all-target-libatomic.
* Makefile.in: Regenerate.
gcc/go:
PR go/55201
* gospec.c (LIBATOMIC): Define.
(LIBATOMIC_PROFILE): Define.
(lang_specific_driver): Add LIBATOMIC[_PROFILE] option.
gcc/testsuite:
* lib/go.exp (go_link_flags): Add libatomic location to flags and
ld_library_path.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194581 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/Makefile.am')
| -rw-r--r-- | libgo/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index fe0f20585fc..a7ac3791b14 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1909,6 +1909,7 @@ libgo_la_LDFLAGS = \ libgo_la_LIBADD = \ $(libgo_go_objs) ../libbacktrace/libbacktrace.la \ + ../libatomic/libatomic.la \ $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS) libgobegin_a_SOURCES = \ @@ -1948,7 +1949,7 @@ GOTESTFLAGS = # Check a package. CHECK = \ - GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ + GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -L `${PWD_COMMAND}`/../libatomic -L `${PWD_COMMAND}`/../libatomic/.libs"; \ export GC; \ GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \ export GOLIBS; \ @@ -1957,7 +1958,7 @@ CHECK = \ MAKE="$(MAKE)"; \ export MAKE; \ libgccdir=`${GOC} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ - LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ + LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:`${PWD_COMMAND}`/../libatomic/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LD_LIBRARY_PATH; \ $(MKDIR_P) $(@D); \ |