diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-18 22:07:38 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-18 22:07:38 +0000 |
| commit | 421f95120ea62307a59c125b8d9eb3084c31670b (patch) | |
| tree | 99611f4471aa323028079176ae8f463b714f05fe /libgo/Makefile.in | |
| parent | c6dc4ad2e81bc4c56cffd43191757ac58be68cf3 (diff) | |
| download | ppe42-gcc-421f95120ea62307a59c125b8d9eb3084c31670b.tar.gz ppe42-gcc-421f95120ea62307a59c125b8d9eb3084c31670b.zip | |
libgo: Link against libatomic_convenience.la.
gcc/go:
PR go/55201
* gospec.c: Revert last patch.
gcc/testsuite:
PR go/55201
* lib/go.exp: Revert last patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194593 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/Makefile.in')
| -rw-r--r-- | libgo/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 31e38ba25c7..869addff25d 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -175,9 +175,10 @@ am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo crypto.lo \ testing/iotest.lo testing/quick.lo unicode/utf16.lo \ unicode/utf8.lo libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ - ../libbacktrace/libbacktrace.la ../libatomic/libatomic.la \ + ../libbacktrace/libbacktrace.la \ + ../libatomic/libatomic_convenience.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) @LIBGO_IS_LINUX_FALSE@am__objects_1 = lock_sema.lo thread-sema.lo @LIBGO_IS_LINUX_TRUE@am__objects_1 = lock_futex.lo thread-linux.lo @HAVE_SYS_MMAN_H_FALSE@am__objects_2 = mem_posix_memalign.lo @@ -2037,7 +2038,7 @@ libgo_la_LDFLAGS = \ libgo_la_LIBADD = \ $(libgo_go_objs) ../libbacktrace/libbacktrace.la \ - ../libatomic/libatomic.la \ + ../libatomic/libatomic_convenience.la \ $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS) libgobegin_a_SOURCES = \ @@ -2072,7 +2073,7 @@ GOTESTFLAGS = # Check a package. CHECK = \ - GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -L `${PWD_COMMAND}`/../libatomic -L `${PWD_COMMAND}`/../libatomic/.libs"; \ + GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ export GC; \ GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \ export GOLIBS; \ @@ -2081,7 +2082,7 @@ CHECK = \ MAKE="$(MAKE)"; \ export MAKE; \ libgccdir=`${GOC} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ - LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:`${PWD_COMMAND}`/../libatomic/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ + LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LD_LIBRARY_PATH; \ $(MKDIR_P) $(@D); \ |
