From patchwork Fri Mar 22 08:39:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 229921 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 1DF842C00D0 for ; Fri, 22 Mar 2013 19:40:10 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=m88n1FIuZzxxTUJm4Z9uGYg6jvdlBFy5oDnw8jXdWN19ev GTiLgHx27nGs98EWtTJCvm2pTLgAlbYzU/wL19a+7iihur33xi0uzGAsyKD8j/PO l+Gd5nde0DYWGPJuotFznzFE1Y6DPu93H6tR72+LG0CcGcLNzy5m7rcpvssaU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=P0eA2CGOLilx9GsuUL684IoVoSw=; b=bea2H0Qq0PrdX7ejFH2A rzmKeucIJdcqCYF92eO+S7mmpWyf0zteXXeiigqzVdIdazg7Rl90h07yz2ZDsdr2 /7ANAPmC/ytngVOlABS4Rw1xfBGzCAWK1evFaGzas+p2I2BeMQlNcRNegOHsfZPq 85M1IZjJPiwvMrZauwoanbo= Received: (qmail 20538 invoked by alias); 22 Mar 2013 08:40:05 -0000 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 Received: (qmail 20439 invoked by uid 89); 22 Mar 2013 08:39:21 -0000 X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, TW_HK autolearn=ham version=3.3.1 Received: from mail-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 22 Mar 2013 08:39:14 +0000 Received: by mail-ie0-f175.google.com with SMTP id c12so4449044ieb.20 for ; Fri, 22 Mar 2013 01:39:12 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.50.7.242 with SMTP id m18mr4270881iga.53.1363941552793; Fri, 22 Mar 2013 01:39:12 -0700 (PDT) Received: by 10.64.14.129 with HTTP; Fri, 22 Mar 2013 01:39:12 -0700 (PDT) Date: Fri, 22 Mar 2013 09:39:12 +0100 Message-ID: Subject: [patch libgcc]: Prepare cygwin.S file to share code with cygwin64 From: Kai Tietz To: GCC Patches Hi, this patch replaces use of _WIN64 by __x86_64__ so mingw x64 and cygwin x64 version can share same source. ChangeLog 2013-03-22 Kai Tietz * config/i386/cygwin.S: Replace use of _WIN64 by __x86_64__. Tested for x86_64-w64-mingw32, x86_64-pc-cygwin, and i686-w64-mingw32. I will apply tomorrow if there are no objections by other Windows-maintainers. Regards, Kai Index: libgcc/config/i386/cygwin.S =================================================================== --- libgcc/config/i386/cygwin.S (Revision 196898) +++ libgcc/config/i386/cygwin.S (Arbeitskopie) @@ -32,7 +32,7 @@ # define cfi_adjust_cfa_offset(X) .cfi_adjust_cfa_offset X # define cfi_def_cfa_register(X) .cfi_def_cfa_register X # define cfi_register(D,S) .cfi_register D, S -# ifdef _WIN64 +# ifdef __x86_64__ # define cfi_push(X) .cfi_adjust_cfa_offset 8; .cfi_rel_offset X, 0 # define cfi_pop(X) .cfi_adjust_cfa_offset -8; .cfi_restore X # else @@ -57,7 +57,7 @@ .global ___chkstk .global __alloca -#ifdef _WIN64 +#ifdef __x86_64__ /* __alloca is a normal function call, which uses %rcx as the argument. */ cfi_startproc() __alloca: @@ -123,7 +123,7 @@ __alloca: pushl 4(%eax) ret cfi_endproc() -#endif /* _WIN64 */ +#endif /* __x86_64__ */ #endif /* L_chkstk */ #ifdef L_chkstk_ms @@ -131,7 +131,7 @@ __alloca: We avoid clobbering any registers. Unlike ___chkstk, it just probes the stack and does no stack allocation. */ .global ___chkstk_ms -#ifdef _WIN64 +#ifdef __x86_64__ cfi_startproc() ___chkstk_ms: pushq %rcx /* save temps */ @@ -183,5 +183,5 @@ ___chkstk_ms: cfi_pop(%ecx) ret cfi_endproc() -#endif /* _WIN64 */ +#endif /* __x86_64__ */ #endif /* L_chkstk_ms */