From patchwork Wed Dec 8 21:31:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Froyd X-Patchwork-Id: 74782 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]) by ozlabs.org (Postfix) with SMTP id BCD2CB6EEB for ; Thu, 9 Dec 2010 08:31:50 +1100 (EST) Received: (qmail 22318 invoked by alias); 8 Dec 2010 21:31:49 -0000 Received: (qmail 22309 invoked by uid 22791); 8 Dec 2010 21:31:49 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, TW_IV, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 08 Dec 2010 21:31:38 +0000 Received: (qmail 27046 invoked from network); 8 Dec 2010 21:31:36 -0000 Received: from unknown (HELO codesourcery.com) (froydnj@127.0.0.2) by mail.codesourcery.com with ESMTPA; 8 Dec 2010 21:31:36 -0000 Date: Wed, 8 Dec 2010 16:31:34 -0500 From: Nathan Froyd To: gcc-patches@gcc.gnu.org Cc: uweigand@de.ibm.com, richard.earnshaw@arm.com Subject: [PATCH] fix PR target/46040, build failure on arm-linux-gnueabi Message-ID: <20101208213133.GE25904@nightcrawler> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-IsSubscribed: yes 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 The patch below implements Joseph's suggestion in: http://gcc.gnu.org/ml/gcc-patches/2010-12/msg00619.html for fixing the bootstrap failures seen on ARM. I'm currently trying this with a cross compilation and attempting a bootstrap on an ARM machine; the bootstrap is progressing *very* slowly, so if anybody (Ulrich?) wanted to try a bootstrap on their (probably faster) machine, that would be appreciated. OK to commit if testing succeeds? -Nathan PR target/46040 * config.gcc (arm*-*-linux-*eabi): Adjust path to bpabi.h. (arm*-*-uclinux*eabi, arm*-*-eabi*): Likewise. diff --git a/gcc/config.gcc b/gcc/config.gcc index dfbf2c5..45bdc6c 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -792,7 +792,7 @@ arm*-*-linux*) # ARM GNU/Linux with ELF tmake_file="${tmake_file} t-linux arm/t-arm" case ${target} in arm*-*-linux-*eabi) - tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" + tm_file="$tm_file ../../gcc/config/arm/bpabi.h arm/linux-eabi.h" tm_file="$tm_file ../../libgcc/config/arm/bpabi.h" tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc" # Define multilib configuration for arm-linux-androideabi. @@ -820,7 +820,7 @@ arm*-*-uclinux*) # ARM ucLinux tmake_file="arm/t-arm arm/t-arm-elf" case ${target} in arm*-*-uclinux*eabi) - tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h" + tm_file="$tm_file ../../gcc/config/arm/bpabi.h arm/uclinux-eabi.h" tm_file="$tm_file ../../libgcc/config/arm/bpabi.h" tmake_file="$tmake_file arm/t-bpabi" # The BPABI long long divmod functions return a 128-bit value in @@ -844,7 +844,8 @@ arm*-*-eabi* | arm*-*-symbianelf* ) # TImode. need_64bit_hwint=yes default_use_cxa_atexit=yes - tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h" + tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h" + tm_file="$tm_file ../../gcc/config/arm/bpabi.h" tm_file="$tm_file ../../libgcc/config/arm/bpabi.h" tmake_file="arm/t-arm arm/t-arm-elf" case ${target} in