From patchwork Fri Nov 14 18:02:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 410959 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AECF014009B for ; Sat, 15 Nov 2014 05:03:29 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=t8nCodbK1oplUBOtEOh7iPccvZscGeamfZOqztL5a9Nu1H gEgiSW81XkVv2WJFZaIuH8Tdi1KxB2KzSoRZfrLHJnAfdGunrgFTwEz6kBy9CMmA gSXClw+ssKkNmnFxkAd4Yu5jOaVdFW7oauUE/kMvK4FMdElyiX9RXyx6qRXqc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=SEJ+GiH0hfaUBMmK8pyKpCgoEJ0=; b=WZugEbwiS98HKAK+574d Kd8lx0maVX3Jk+zh25Xwtu29hQa1R94xP7yYYy6i6AW48oekmE0UUnrKa68UY+b8 aJfYrzYzsAdPSkSkG0x1Fxh6Ya7Tt0aBIWiRKMWCXy352fQ4GHwIyVDamZtQgtmh dXoWpLlZZ0XYr84htn/h+Ps= Received: (qmail 15040 invoked by alias); 14 Nov 2014 18:02:58 -0000 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 Received: (qmail 14969 invoked by uid 89); 14 Nov 2014 18:02:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-yk0-f172.google.com Received: from mail-yk0-f172.google.com (HELO mail-yk0-f172.google.com) (209.85.160.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 14 Nov 2014 18:02:55 +0000 Received: by mail-yk0-f172.google.com with SMTP id 10so6666324ykt.31 for ; Fri, 14 Nov 2014 10:02:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=TYl0aLhfF3Ji6NPLWzr0054Pk/CJhiUae768YiJ1ABk=; b=VXUeF3RSA8pwcPUyBGPX1NvkrDDzbyuLTt85KcA2VaXZ6Yv1dsmPUOlHNjW549N/RQ vVtNikyKZWFgGs44Cloj0SK1FrC9+x/yYd/2V0nnYNwaMBbtb2cJIvjQ2RlqH1wfKX/i 3t18Lyo8OtJqfsLZY4V68EZoamEeXB8O1Y6hu/cpdRs196zkGvy+HHYQlpJ6hnJFFpWV MmKLsV3e+0ulJNqbU3zM1z60a9Dp4ZuFJIANegItMGXsHCzar9rpC7HUOhiDiCvIzIr3 chpycSoMmsCM+1GnpvIn1/6CjRWswZMfqvjmc0HzVtsJ4nEpT2gsLHCDC+UuekuhEQkM 1yyg== X-Gm-Message-State: ALoCoQnfkjqmJzhOU8ijj/3ehiP+umXdMrTSPYcHSrg7Ak8nA1qT6zdQmOJjK+7z2xA+1UoDMNIU MIME-Version: 1.0 X-Received: by 10.236.13.46 with SMTP id a34mr12216060yha.10.1415988173913; Fri, 14 Nov 2014 10:02:53 -0800 (PST) Received: by 10.170.136.84 with HTTP; Fri, 14 Nov 2014 10:02:53 -0800 (PST) Date: Fri, 14 Nov 2014 10:02:53 -0800 Message-ID: Subject: Install llgo version of libgo under a different name From: Ian Taylor To: gcc-patches , "gofrontend-dev@googlegroups.com" This patch from Peter Collingbourne installs libgo under a different name when it is built using llgo. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r ed47faa83681 libgo/Makefile.am --- a/libgo/Makefile.am Wed Nov 12 16:07:28 2014 -0800 +++ b/libgo/Makefile.am Fri Nov 14 09:40:03 2014 -0800 @@ -99,8 +99,13 @@ # Subdir rules rely on $(FLAGS_TO_PASS) FLAGS_TO_PASS = $(AM_MAKEFLAGS) +if GOC_IS_LLGO +toolexeclib_LTLIBRARIES = libgo-llgo.la +toolexeclib_LIBRARIES = libgobegin-llgo.a +else toolexeclib_LTLIBRARIES = libgo.la toolexeclib_LIBRARIES = libgobegin.a +endif toolexeclibgo_DATA = \ bufio.gox \ @@ -1993,18 +1998,27 @@ unicode/utf16.lo \ unicode/utf8.lo -libgo_la_SOURCES = $(runtime_files) - -libgo_la_LDFLAGS = \ +libgo_ldflags = \ -version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS) -libgo_la_LIBADD = \ +libgo_libadd = \ $(libgo_go_objs) ../libbacktrace/libbacktrace.la \ $(LIBATOMIC) $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS) +libgo_la_SOURCES = $(runtime_files) +libgo_la_LDFLAGS = $(libgo_ldflags) +libgo_la_LIBADD = $(libgo_libadd) + +libgo_llgo_la_SOURCES = $(runtime_files) +libgo_llgo_la_LDFLAGS = $(libgo_ldflags) +libgo_llgo_la_LIBADD = $(libgo_libadd) + libgobegin_a_SOURCES = \ runtime/go-main.c +libgobegin_llgo_a_SOURCES = \ + runtime/go-main.c + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GOCFLAGS = $(CFLAGS) @@ -2066,7 +2080,7 @@ fi # Build all packages before checking any. -CHECK_DEPS = libgo.la libgobegin.a \ +CHECK_DEPS = \ $(toolexeclibgo_DATA) \ $(toolexeclibgoarchive_DATA) \ $(toolexeclibgocompress_DATA) \ @@ -2095,6 +2109,12 @@ $(toolexeclibgotexttemplate_DATA) \ $(toolexeclibgounicode_DATA) +if GOC_IS_LLGO +CHECK_DEPS += libgo-llgo.la libgobegin-llgo.a +else +CHECK_DEPS += libgo.la libgobegin.a +endif + @go_include@ bufio.lo.dep bufio.lo.dep: $(go_bufio_files) $(BUILDDEPS) diff -r ed47faa83681 libgo/configure.ac --- a/libgo/configure.ac Wed Nov 12 16:07:28 2014 -0800 +++ b/libgo/configure.ac Fri Nov 14 09:40:03 2014 -0800 @@ -392,6 +392,14 @@ [Define if the linker support split stack adjustments]) fi +AC_CACHE_CHECK([whether compiler is llgo], +[libgo_cv_c_goc_is_llgo], +[libgo_cv_c_goc_is_llgo=no +if $GOC -dumpversion 2>/dev/null | grep llgo >/dev/null 2>&1; then + libgo_cv_c_goc_is_llgo=yes +fi]) +AM_CONDITIONAL(GOC_IS_LLGO, test "$libgo_cv_c_goc_is_llgo" = yes) + dnl Test for the -lm library. MATH_LIBS= AC_CHECK_LIB([m], [sqrt], MATH_LIBS=-lm)