From patchwork Mon Apr 11 19:28:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 90638 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 4A57FB6F14 for ; Tue, 12 Apr 2011 05:28:35 +1000 (EST) Received: (qmail 8399 invoked by alias); 11 Apr 2011 19:28:33 -0000 Received: (qmail 8391 invoked by uid 22791); 11 Apr 2011 19:28:33 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, TW_XG, 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; Mon, 11 Apr 2011 19:28:27 +0000 Received: (qmail 3805 invoked from network); 11 Apr 2011 19:28:26 -0000 Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by mail.codesourcery.com with ESMTPA; 11 Apr 2011 19:28:26 -0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1Q9Mme-0000df-Pm; Mon, 11 Apr 2011 19:28:24 +0000 Date: Mon, 11 Apr 2011 19:28:24 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org cc: thomas@schwinge.name, rth@redhat.com, jh@suse.cz, ubizjak@gmail.com Subject: Clean up i386/gnu.h Message-ID: MIME-Version: 1.0 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 Now that gnu-user*.h and linux*.h config headers have more or less the proper contents, the next stage in stopping non-Linux-kernel-based targets from using linux*.h is to get the correct contents into the headers for the non-Linux-kernel-based targets. This patch does so for i386/gnu.h. GNU_USER_LINK_EMULATION is defined (to the same value as in i386/linux.h, so just duplicating that definition until this target stops using i386/linux.h). CPP_SPEC, duplicating the i386/gnu-user.h definition, is removed, as is CC1_SPEC (missing -profile support from the gnu-user version, which should be there judging by -profile support in other specs). ENDFILE_SPEC is also removed; the gnu-user version has additional support for crtfastmath.o and crtprec*.o and since libgcc/config.host indicates those files get built for GNU/Hurd, the gnu-user spec that uses those files should be used for GNU/Hurd. Tested building cc1 and xgcc for cross to i686-gnu. OK to commit? 2011-04-11 Joseph Myers * config/i386/gnu.h (GNU_USER_LINK_EMULATION): Define. (CPP_SPEC, CC1_SPEC, ENDFILE_SPEC): Remove. Index: gcc/config/i386/gnu.h =================================================================== --- gcc/config/i386/gnu.h (revision 172273) +++ gcc/config/i386/gnu.h (working copy) @@ -20,15 +20,11 @@ You should have received a copy of the G along with GCC. If not, see . */ +#define GNU_USER_LINK_EMULATION "elf_i386" + #undef GNU_USER_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so" -#undef CPP_SPEC -#define CPP_SPEC "%{pthread:-D_REENTRANT} %{posix:-D_POSIX_SOURCE}" - -#undef CC1_SPEC -#define CC1_SPEC "%(cc1_cpu)" - #undef STARTFILE_SPEC #if defined HAVE_LD_PIE #define STARTFILE_SPEC \ @@ -40,10 +36,6 @@ along with GCC. If not, see