From patchwork Thu Sep 4 20:56:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Hundven X-Patchwork-Id: 386013 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 9CC131400B9 for ; Fri, 5 Sep 2014 06:57:17 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=Wd9fDzNQU3Ejdrv1bxnmoEdO6QrwOot4b6EiTDsyeVzMvY6bsUdDl jhlSP2Kt41d6TTCn/nlYD0CoaemQh1mX0OL8Cm5xy26pCH5wvausJpXS6HwjFYdN Td1wd966vtbXIjYNnXVtoJXcbbUDk9ggc2zh8a5GIN6V10zz3uIxB4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=at8J56YdBu3oVjVHaxY5s30RpNI=; b=jz5hgzo7Xr0eRbbNtUbHmRsWUQoN b5PMopUoU2xmjQoSz3iY5tQelVtkOK6VDcU4+2lZa3rvpgfUpoSe7fqJ24q/nczv 5VNCcgo0lubb29Yo68ac+dQTCHxmdpOEXGskEX0YCjAWMFqifInvRmxT1D1o0Hbi tEMO9BTkGTWF9ek= Received: (qmail 12336 invoked by alias); 4 Sep 2014 20:57:06 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 12316 invoked by uid 89); 4 Sep 2014 20:57:06 -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, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f52.google.com Received: from mail-pa0-f52.google.com (HELO mail-pa0-f52.google.com) (209.85.220.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 04 Sep 2014 20:57:04 +0000 Received: by mail-pa0-f52.google.com with SMTP id eu11so20839573pac.39 for ; Thu, 04 Sep 2014 13:57:02 -0700 (PDT) X-Received: by 10.70.94.103 with SMTP id db7mr12814109pdb.122.1409864222592; Thu, 04 Sep 2014 13:57:02 -0700 (PDT) Received: from fuzzy.hsd1.wa.comcast.net (c-50-135-131-187.hsd1.wa.comcast.net. [50.135.131.187]) by mx.google.com with ESMTPSA id qk2sm70394pbc.18.2014.09.04.13.57.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 13:57:01 -0700 (PDT) From: Bryan Hundven To: "Yann E. MORIN" Cc: crossgcc@sourceware.org, Bryan Hundven Subject: [PATCH 1/5] libc/musl: Remove gcc core pass-1 from musl-libc build Date: Thu, 4 Sep 2014 13:56:53 -0700 Message-Id: <1409864217-17035-1-git-send-email-bryanhundven@gmail.com> X-IsSubscribed: yes In an effort to make the toolchain build simpler, remove the need for the pass-1 build of gcc. Also, let musl's configure script decide if we need the gcc wrapper or not. Signed-off-by: Bryan Hundven --- config/libc/musl.in | 2 +- scripts/build/libc/musl.sh | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/config/libc/musl.in b/config/libc/musl.in index b3bec26..8f393b2 100644 --- a/config/libc/musl.in +++ b/config/libc/musl.in @@ -3,7 +3,7 @@ ## depends on ! WINDOWS && ! BARE_METAL ## ## select LIBC_SUPPORT_THREADS_NATIVE -## select CC_CORE_PASSES_NEEDED +## select CC_CORE_PASS_2_NEEDED ## ## help Musl is a new standard library to power a new generation of Linux-based ## help devices. musl is lightweight, fast, simple, free, and strives to be diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index 7172cf2..6dbf657 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -48,7 +48,7 @@ do_libc_configure() { # NOTE: musl handles the build/host/target a little bit differently # then one would expect: # build : not used - # host : the machine building musl + # host : the machine musl runs on # target : the machine musl runs on CT_DoExecLog CFG \ CFLAGS="${extra_cflags[@]}" \ @@ -56,30 +56,11 @@ do_libc_configure() { ./configure \ --host="${CT_TARGET}" \ --target="${CT_TARGET}" \ - --prefix="/usr" \ - --disable-gcc-wrapper + --prefix="/usr" } do_libc_start_files() { - CT_DoStep INFO "Installing C library headers" - - # Simply copy files until musl has the ability to build out-of-tree - CT_DoLog EXTRA "Copying sources to build directory" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/musl-${CT_LIBC_VERSION}" \ - "${CT_BUILD_DIR}/build-libc-headers" - cd "${CT_BUILD_DIR}/build-libc-headers" - - do_libc_configure - - CT_DoLog EXTRA "Installing headers" - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install-headers - - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" \ - crt/crt1.o crt/crti.o crt/crtn.o - CT_DoExecLog ALL cp -av crt/crt*.o "${CT_SYSROOT_DIR}/usr/lib" - CT_DoExecLog ALL ${CT_TARGET}-gcc -nostdlib \ - -nostartfiles -shared -x c /dev/null -o "${CT_SYSROOT_DIR}/usr/lib/libc.so" - CT_EndStep + : } do_libc() {