From patchwork Tue Sep 18 14:28:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Shawcroft X-Patchwork-Id: 184739 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 AEC3E2C0085 for ; Wed, 19 Sep 2012 00:29:23 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1348583364; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=QvEXQ2G VxWssfWiOeoGpqb7mYkI=; b=S2GW+dsq38F3XcboEXAEB//a40sF39Rs0YfdtgH UF+cpbXPLxzM7Z2c8nZbOcuoeL/L8xx9cd9Q5HLrEApsJlX3YEy5REHqENIefbCk 98WE+zI7ZIxrgMU3pmciFXz7SlBkmioTAkv5QBY7uKDCy9hF+iSvd8gyutZU+Yao dqBc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:X-MC-Unique:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=CP+Nf/2ZdvmuP+nUHBWl//1mGhsuHTsL9mgjkLNvYCFc7J8zBexENGpgLZGds1 xBWgaFSjBf5rfVAXRasezrY9UmzQRI862oNXzddrlkyjeEZI7Ruda60mEgG9U/kv mdnUVHTA89MHODDMz0D4rI5Yq48FRakXWQWmCcziHbfkY=; Received: (qmail 23698 invoked by alias); 18 Sep 2012 14:29:17 -0000 Received: (qmail 23685 invoked by uid 22791); 18 Sep 2012 14:29:16 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 18 Sep 2012 14:29:00 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 18 Sep 2012 15:28:58 +0100 Received: from [10.1.72.50] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 Sep 2012 15:28:57 +0100 Message-ID: <50588528.8030304@arm.com> Date: Tue, 18 Sep 2012 15:28:56 +0100 From: Marcus Shawcroft User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [AARCH64-4.7][PATCH] Remove hardwired multiarch. X-MC-Unique: 112091815285808401 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 I've just back ported this into ARM/AARCH64-4.7. /Marcus 2012-09-18 Marcus Shawcroft * config/aarch64/aarch64-linux.h (MULTIARCH_TUPLE): Remove. (STANDARD_STARTFILE_PREFIX_1): Likewise. (STANDARD_STARTFILE_PREFIX_2): Likewise. diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h index 2b5ec7e..faf2e6c 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -21,14 +21,6 @@ #ifndef GCC_AARCH64_LINUX_H #define GCC_AARCH64_LINUX_H -#define MULTIARCH_TUPLE "aarch64-linux-gnu" - -#undef STANDARD_STARTFILE_PREFIX_1 -#define STANDARD_STARTFILE_PREFIX_1 "/lib/" MULTIARCH_TUPLE "/" - -#undef STANDARD_STARTFILE_PREFIX_2 -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" MULTIARCH_TUPLE "/" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" #define LINUX_TARGET_LINK_SPEC "%{h*} \ -- 1.7.12.rc0.22.gcdd159b