From 69fffc1f0e2bbb7d7eb21909daf3b1b365da4cd2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 18 Dec 2012 22:07:38 +0000 Subject: [PATCH] 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. From-SVN: r194593 --- gcc/go/ChangeLog | 5 +++++ gcc/go/gospec.c | 8 -------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/go.exp | 5 ----- libgo/Makefile.am | 6 +++--- libgo/Makefile.in | 11 ++++++----- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index a29a8e010b3..477e6ed32f7 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,8 @@ +2012-12-18 Ian Lance Taylor + + PR go/55201 + * gospec.c: Revert last patch. + 2012-12-18 Andreas Schwab PR go/55201 diff --git a/gcc/go/gospec.c b/gcc/go/gospec.c index c22ad6c7c97..20372f0f470 100644 --- a/gcc/go/gospec.c +++ b/gcc/go/gospec.c @@ -45,9 +45,6 @@ along with GCC; see the file COPYING3. If not see #define THREAD_LIBRARY "pthread" #define THREAD_LIBRARY_PROFILE THREAD_LIBRARY -#define LIBATOMIC "atomic" -#define LIBATOMIC_PROFILE LIBATOMIC - #define LIBGO "go" #define LIBGO_PROFILE LIBGO #define LIBGOBEGIN "gobegin" @@ -339,11 +336,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, added_libraries++; j++; - generate_option (OPT_l, saw_profile_flag ? LIBATOMIC_PROFILE : LIBATOMIC, - 1, CL_DRIVER, &new_decoded_options[j]); - added_libraries++; - j++; - #ifdef HAVE_LD_STATIC_DYNAMIC if (library > 1 && !static_link) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcb4bd94392..e2044088cf4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-12-18 Ian Lance Taylor + + PR go/55201 + * lib/go.exp: Revert last patch. + 2012-12-18 Richard Biener PR middle-end/54838 diff --git a/gcc/testsuite/lib/go.exp b/gcc/testsuite/lib/go.exp index 8eea9fa8363..8c908a5ced1 100644 --- a/gcc/testsuite/lib/go.exp +++ b/gcc/testsuite/lib/go.exp @@ -111,11 +111,6 @@ proc go_link_flags { paths } { append flags "-L${gccpath}/libgo/.libs " append ld_library_path ":${gccpath}/libgo/.libs" } - if { [file exists "${gccpath}/libatomic/.libs/libatomic.a"] \ - || [file exists "${gccpath}/libatomic/.libs/libatomic.${shlib_ext}"] } { - append flags "-L${gccpath}/libatomic/.libs " - append ld_library_path ":${gccpath}/libatomic/.libs" - } if [file exists "${gccpath}/libiberty/libiberty.a"] { append flags "-L${gccpath}/libiberty " } diff --git a/libgo/Makefile.am b/libgo/Makefile.am index a7ac3791b14..3da2cb4fae2 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1909,7 +1909,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 = \ @@ -1949,7 +1949,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; \ @@ -1958,7 +1958,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); \ 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); \