From 69fffc1f0e2bbb7d7eb21909daf3b1b365da4cd2 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Tue, 18 Dec 2012 22:07:38 +0000
Subject: 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 -----
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'gcc')

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index a29a8e0..477e6ed 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-18  Ian Lance Taylor  <iant@google.com>
+
+	PR go/55201
+	* gospec.c: Revert last patch.
+
 2012-12-18  Andreas Schwab  <schwab@linux-m68k.org>
 
 	PR go/55201
diff --git a/gcc/go/gospec.c b/gcc/go/gospec.c
index c22ad6c..20372f0 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 dcb4bd9..e204408 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-18  Ian Lance Taylor  <iant@google.com>
+
+	PR go/55201
+	* lib/go.exp: Revert last patch.
+
 2012-12-18  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/54838
diff --git a/gcc/testsuite/lib/go.exp b/gcc/testsuite/lib/go.exp
index 8eea9fa..8c908a5 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 "
       }
-- 
cgit v1.1