From patchwork Wed Sep 8 18:28:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 64193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 7447AB6EEA for ; Thu, 9 Sep 2010 04:29:02 +1000 (EST) Received: (qmail 30038 invoked by alias); 8 Sep 2010 18:29:00 -0000 Received: (qmail 30022 invoked by uid 22791); 8 Sep 2010 18:28:59 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, TW_CC, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 08 Sep 2010 18:28:54 +0000 Received: from kpbe20.cbf.corp.google.com (kpbe20.cbf.corp.google.com [172.25.105.84]) by smtp-out.google.com with ESMTP id o88ISps6019414 for ; Wed, 8 Sep 2010 11:28:52 -0700 Received: from qyk30 (qyk30.prod.google.com [10.241.83.158]) by kpbe20.cbf.corp.google.com with ESMTP id o88ISoLx027974 for ; Wed, 8 Sep 2010 11:28:50 -0700 Received: by qyk30 with SMTP id 30so7223153qyk.2 for ; Wed, 08 Sep 2010 11:28:50 -0700 (PDT) Received: by 10.224.66.165 with SMTP id n37mr270091qai.10.1283970530016; Wed, 08 Sep 2010 11:28:50 -0700 (PDT) Received: from coign.google.com (dhcp-172-22-123-203.mtv.corp.google.com [172.22.123.203]) by mx.google.com with ESMTPS id t4sm316666qcs.16.2010.09.08.11.28.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 08 Sep 2010 11:28:49 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: [gccgo] Merge libgotesting into libgo Date: Wed, 08 Sep 2010 11:28:47 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org A long time ago I split libgotesting out of libgo, because I was using constructors to run initializers and it caused some problem I can not recall. However, I have since fixed the way that initializers are run, and we now only initialized packages which were actually imported. This patch merges libgotesting back into libgo, which is simpler and more correct. Committed to gccgo branch. Ian diff -r 49d113913255 libgo/Makefile.am --- a/libgo/Makefile.am Wed Sep 08 11:10:07 2010 -0700 +++ b/libgo/Makefile.am Wed Sep 08 11:27:44 2010 -0700 @@ -92,7 +92,7 @@ # Subdir rules rely on $(FLAGS_TO_PASS) FLAGS_TO_PASS = $(AM_MAKEFLAGS) -toolexeclib_LTLIBRARIES = libgo.la libgotesting.la +toolexeclib_LTLIBRARIES = libgo.la toolexeclib_LIBRARIES = libgobegin.a toolexeclib_DATA = \ @@ -1177,7 +1177,11 @@ os/libsignal.la \ rpc/libjsonrpc.la \ runtime/libpprof.la \ - syscalls/libsyscall.la + syscalls/libsyscall.la \ + testing/libtesting.la \ + testing/libiotest.la \ + testing/libquick.la \ + testing/libscript.la libgo_la_SOURCES = $(runtime_files) @@ -1186,13 +1190,6 @@ libgobegin_a_SOURCES = \ runtime/go-main.c -libgotesting_la_SOURCES = -libgotesting_la_LIBADD = \ - testing/libtesting.la \ - testing/libiotest.la \ - testing/libquick.la \ - testing/libscript.la - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GOFLAGS = $(CFLAGS) diff -r 49d113913255 libgo/testsuite/gotest --- a/libgo/testsuite/gotest Wed Sep 08 11:10:07 2010 -0700 +++ b/libgo/testsuite/gotest Wed Sep 08 11:27:44 2010 -0700 @@ -16,7 +16,7 @@ GC=${GC:-gccgo} GL=${GL:-${GC-gccgo}} -GOLIBS=${GOLIBS:=-lgotesting} +GOLIBS= export GC GL GOLIBS # srcdir is where the source files are found. basedir is where the