From patchwork Tue Apr 9 06:29:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 234968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BA18E2C00B6 for ; Tue, 9 Apr 2013 16:29:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EBABE10B8E3; Tue, 9 Apr 2013 06:29:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Lfr-+Cgv7YC; Tue, 9 Apr 2013 06:29:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 545F910B91D; Tue, 9 Apr 2013 06:28:54 +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 EC7488F7AA for ; Tue, 9 Apr 2013 06:29:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D7298688C for ; Tue, 9 Apr 2013 06:29:07 +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 kGoPb3y+loqC for ; Tue, 9 Apr 2013 06:29:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from am1outboundpool.messaging.microsoft.com (am1ehsobe005.messaging.microsoft.com [213.199.154.208]) by whitealder.osuosl.org (Postfix) with ESMTPS id B6D6384C65 for ; Tue, 9 Apr 2013 06:29:05 +0000 (UTC) Received: from mail91-am1-R.bigfish.com (10.3.201.252) by AM1EHSOBE024.bigfish.com (10.3.207.146) with Microsoft SMTP Server id 14.1.225.23; Tue, 9 Apr 2013 06:29:03 +0000 Received: from mail91-am1 (localhost [127.0.0.1]) by mail91-am1-R.bigfish.com (Postfix) with ESMTP id AF5A0600B2; Tue, 9 Apr 2013 06:29:03 +0000 (UTC) X-Forefront-Antispam-Report: CIP:137.71.25.55; KIP:(null); UIP:(null); IPV:NLI; H:nwd2mta1.analog.com; RD:nwd2mail10.analog.com; EFVD:NLI X-SpamScore: 12 X-BigFish: VS12(zzzz1f42h1fc6h1ee6h1ce5h1fdah1202h1fd0h1e76h1d1ah1cabh1d2ahzz8275bhz2ei87h2a8h668h839hd24he5bh1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h13eah1441h1504h1537h15a8h162dh1631h1758h17eeh1898h18e1h1946h19b5h1b0ahff4m1355m129fi1155h) Received-SPF: neutral (mail91-am1: 137.71.25.55 is neither permitted nor denied by domain of gmail.com) client-ip=137.71.25.55; envelope-from=sonic.adi@gmail.com; helo=nwd2mta1.analog.com ; 1.analog.com ; X-FB-DOMAIN-IP-MATCH: fail Received: from mail91-am1 (localhost.localdomain [127.0.0.1]) by mail91-am1 (MessageSwitch) id 1365488925976632_16747; Tue, 9 Apr 2013 06:28:45 +0000 (UTC) Received: from AM1EHSMHS015.bigfish.com (unknown [10.3.201.230]) by mail91-am1.bigfish.com (Postfix) with ESMTP id E1F0918019E; Tue, 9 Apr 2013 06:28:45 +0000 (UTC) Received: from nwd2mta1.analog.com (137.71.25.55) by AM1EHSMHS015.bigfish.com (10.3.207.153) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 9 Apr 2013 06:28:45 +0000 Received: from NWD2HUBCAS6.ad.analog.com (nwd2hubcas6.ad.analog.com [10.64.72.159]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id r396Sire017110 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 8 Apr 2013 23:28:44 -0700 Received: from zeus.spd.analog.com (10.64.82.11) by NWD2HUBCAS6.ad.analog.com (10.64.72.159) with Microsoft SMTP Server id 14.3.123.3; Tue, 9 Apr 2013 02:28:44 -0400 Received: from linux.site ([10.99.22.20]) by zeus.spd.analog.com (8.14.6/8.14.6) with ESMTP id r396SgZG007452; Tue, 9 Apr 2013 02:28:42 -0400 Received: from localhost.localdomain (unknown [10.99.22.72]) by linux.site (Postfix) with ESMTP id 4FE2E42CE3CA; Mon, 8 Apr 2013 17:01:33 -0600 (MDT) From: Sonic Zhang To: Thomas Petazzoni , Arnout Vandecappelle , Date: Tue, 9 Apr 2013 14:29:45 +0800 Message-ID: <1365488988-21604-4-git-send-email-sonic.adi@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1365488988-21604-1-git-send-email-sonic.adi@gmail.com> References: <1365488988-21604-1-git-send-email-sonic.adi@gmail.com> MIME-Version: 1.0 Cc: Sonic Zhang , buildroot-devel@blackfin.uclinux.org Subject: [Buildroot] [PATCH v3 4/7] arch: toolchain: Introduce binary format FLAT types. 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Sonic Zhang v3-changes: - Add dependancy to bfin and m68k - Add help text for FLAT binary types. - Split shared flat flags. v2-changes: none v1-changes: - Just introduce the symbol and options in arch generic Config.in. Append FLAT types specific link flags into external toolchain wrapper. Signed-off-by: Sonic Zhang --- arch/Config.in | 23 ++++++++++++++++++++ toolchain/toolchain-external/ext-tool.mk | 8 +++++++ .../toolchain-external/ext-toolchain-wrapper.c | 7 ++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index b4ee38b..9bc2d6e 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -206,6 +206,29 @@ config BR2_BINFMT_FLAT where no MMU is available. endchoice +# Set up flat binary type +choice + prompt "FLAT Binary type" + depends on BR2_BINFMT_FLAT + default BR2_BINFMT_FLAT_ONE +config BR2_BINFMT_FLAT_ONE + bool "One memory region" + help + All segments are linked into one memory region. +config BR2_BINFMT_FLAT_SEP_DATA + bool "Separate data and code region" + depends on BR2_bfin || BR2_m68k + help + Allow for the data and text segments to be separated and placed in + different regions of memory. + +config BR2_BINFMT_FLAT_SHARED + bool "Shared binary" + depends on BR2_bfin || BR2_m68k + help + Allow to load and link indiviual FLAT binaries at run time. +endchoice + if BR2_arm || BR2_armeb source "arch/Config.in.arm" endif diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 27fd296..0ca1307 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -168,6 +168,14 @@ ifeq ($(BR2_BINFMT_FLAT),y) TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT endif +ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -msep-data +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT_SEP_DATA +endif +ifeq ($(BR2_BINFMT_FLAT_SHARED),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -mid-shared-library -mshared-library-id=0 +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT_SHARED +endif ifneq ($(BR2_TARGET_OPTIMIZATION),) TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index 9a2fc70..78f1152 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -50,6 +50,13 @@ static char *predef_args[] = { #ifdef BR_BINFMT_FLAT "-Wl,-elf2flt", #endif +#ifdef BR_BINFMT_FLAT_SEP_DATA + "-msep-data", +#endif +#ifdef BR_BINFMT_FLAT_SHARED + "-mid-shared-library", + "-mshared-library-id=0", +#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS #endif