From patchwork Sun Nov 15 12:24:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 544831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 1503C140D7C for ; Sun, 15 Nov 2015 23:25:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 381F5884E6; Sun, 15 Nov 2015 12:25:06 +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 d7OcX4jHJfgo; Sun, 15 Nov 2015 12:25:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 39C60884BE; Sun, 15 Nov 2015 12:25:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 117571C0FC3 for ; Sun, 15 Nov 2015 12:25:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C1DE884AE for ; Sun, 15 Nov 2015 12:25:02 +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 1wUaSpxSRCAN for ; Sun, 15 Nov 2015 12:24:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from helium.waldemar-brodkorb.de (helium.waldemar-brodkorb.de [89.238.66.15]) by whitealder.osuosl.org (Postfix) with ESMTPS id 044168829F for ; Sun, 15 Nov 2015 12:24:58 +0000 (UTC) Received: by helium.waldemar-brodkorb.de (Postfix, from userid 1000) id 095DE1022D; Sun, 15 Nov 2015 13:24:55 +0100 (CET) Date: Sun, 15 Nov 2015 13:24:55 +0100 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: <20151115122455.GA29481@waldemar-brodkorb.de> MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 3.2.0-4-amd64 x86_64 User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [Buildroot] [PATCH] boost: fix sparc compile X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Like for sparc64, set correct instruction set. Patch is obsoleted by this changeset. Signed-off-by: Waldemar Brodkorb --- boost::context still does not compile. Don't know why it is disabled for sparc/sparc64 as it contains the needed code. Need to check on my sparc systems before enabling via a patch. --- ...0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch | 42 -------------------- package/boost/boost.mk | 4 ++ 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch diff --git a/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch b/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch deleted file mode 100644 index a4d39b3..0000000 --- a/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ec60c37295146bb80aa44a92cf416027b75b5ff7 Mon Sep 17 00:00:00 2001 -From: Vladimir Prus -Date: Mon, 27 Apr 2015 19:12:54 +0300 -Subject: [PATCH] Remove bogus 'c3' cpu varant for SPARC. - -Signed-off-by: Gustavo Zacarias ---- - src/tools/gcc.jam | 3 +-- - src/tools/gcc.py | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam -index eff95ae..128ab84 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -1138,8 +1138,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; - ## - cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; - # Sparc --cpu-flags gcc OPTIONS : sparc : c3 : -mcpu=c3 : default ; --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 ; -+cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; - cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; - cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; - cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; -diff --git a/src/tools/gcc.py b/src/tools/gcc.py -index a13ce7a..d2d3294 100644 ---- a/tools/build/src/tools/gcc.py -+++ b/tools/build/src/tools/gcc.py -@@ -789,8 +789,7 @@ cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom']) - # Sparc - flags('gcc', 'OPTIONS', ['sparc/32'], ['-m32']) - flags('gcc', 'OPTIONS', ['sparc/64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'c3', ['-mcpu=c3'], default=True) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7']) -+cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress']) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8']) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc']) --- -2.3.6 - diff --git a/package/boost/boost.mk b/package/boost/boost.mk index d91baf1..74bb710 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -89,6 +89,10 @@ BOOST_OPTS += toolset=gcc \ abi=$(BOOST_ABI) \ variant=$(if $(BR2_ENABLE_DEBUG),debug,release) +ifeq ($(BR2_sparc),y) +BOOST_OPTS += architecture=sparc instruction-set=v8 +endif + ifeq ($(BR2_sparc64),y) BOOST_OPTS += architecture=sparc instruction-set=ultrasparc endif