From patchwork Mon Jan 27 21:51:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 314517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 633E42C00AB for ; Tue, 28 Jan 2014 08:58:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B966F93D82; Mon, 27 Jan 2014 21:58:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fJEEpSoSYrtf; Mon, 27 Jan 2014 21:58:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AC45893E09; Mon, 27 Jan 2014 21:58:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4DAA61BFA9F for ; Mon, 27 Jan 2014 21:58:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 496BD8CBC2 for ; Mon, 27 Jan 2014 21:58:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q2NaE6HqikDe for ; Mon, 27 Jan 2014 21:58:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f174.google.com (mail-yk0-f174.google.com [209.85.160.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id 76D3D8CB78 for ; Mon, 27 Jan 2014 21:58:49 +0000 (UTC) Received: by mail-yk0-f174.google.com with SMTP id 10so13649529ykt.5 for ; Mon, 27 Jan 2014 13:58:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ObIvXhDinmLyGyPgzUaFuQKKR/7OTLxcS3MPl1Jb0Zs=; b=h+uEisu7LcR1cO7J390mGlk+zwfUdmJ01oadgnDTKlGMS9XADYg+nR12HupICPTfYT CsPW84PBxo16aIi/Fc+yuMUjacA7m132uU+Xz0ZfA7yodbYQawpP5pqNUMNIhLB6TroR /jkwuyK4FeC/iIabxCmFEqrOeWc4lehXvBpPrAh4jylY1sx6KmXF1jbRj6P4XojA+jLN IXitPXSYdzkMPra8Smxp8RHeWjVfiO5XN1TFAfTzR1fEaxag1rIJW27WnmDojQo6SJBb UwKEJQXtnVRhLuNuUFMHfST7KF00DQIv2Z6+ouSNjudaqV1gVgOn8MIAtI+TknIBxSi5 jlBw== X-Gm-Message-State: ALoCoQnRHaO/6hMRnuSN9V1qwcdAg/3PvHQPj5tIAeztRXMRHr3K7vXb7xTbibo+wAsJvjHxovOf X-Received: by 10.236.168.166 with SMTP id k26mr3020798yhl.64.1390859518004; Mon, 27 Jan 2014 13:51:58 -0800 (PST) Received: from bourban.gateway.2wire.net (108-90-245-135.lightspeed.cicril.sbcglobal.net. [108.90.245.135]) by mx.google.com with ESMTPSA id o27sm38364331yhb.19.2014.01.27.13.51.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 13:51:57 -0800 (PST) From: Spenser Gilliland To: buildroot@busybox.net Date: Mon, 27 Jan 2014 15:51:37 -0600 Message-Id: <1390859507-31670-1-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH v2] gcc: coexist upstream with vendor git releases for mb and arc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch makes it easier to have both upstream gcc and vendor patch series for microblaze and arc. Signed-off-by: Spenser Gilliland --- package/gcc/Config.in.host | 4 ++-- package/gcc/gcc.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 186ba80..044cd0f 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -96,8 +96,8 @@ config BR2_GCC_VERSION default "4.6.4" if BR2_GCC_VERSION_4_6_X default "4.7.3" if BR2_GCC_VERSION_4_7_X default "4.8.2" if BR2_GCC_VERSION_4_8_X - default "7466697995233cc3aab5b9427bf843e3c7fabd80" if BR2_GCC_VERSION_4_8_ARC - default "b93bb009e021aba64dd4b8cdb0bbc5a176c55543" if BR2_GCC_VERSION_4_9_MICROBLAZE + default "arc-git" if BR2_GCC_VERSION_4_8_ARC + default "mb-git" if BR2_GCC_VERSION_4_9_MICROBLAZE default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 236297d..dd99604 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),) GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/ else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32) GCC_SITE = ftp://www.at91.com/pub/buildroot/ -else ifeq ($(BR2_arc),y) +else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity) +GCC_VERSION = 7466697995233cc3aab5b9427bf843e3c7fabd80 GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz -else ifeq ($(BR2_microblaze),y) +else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity) +GCC_VERSION = b93bb009e021aba64dd4b8cdb0bbc5a176c55543 GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz else