Patchwork [libgcc] : Prepare cygwin.S file to share code with cygwin64

login
register
mail settings
Submitter Kai Tietz
Date March 22, 2013, 8:39 a.m.
Message ID <CAEwic4YEPGM1oaptQxSSB1Fh9Eu7wE98+GdWKGaO9=C5xCOU9g@mail.gmail.com>
Download mbox | patch
Permalink /patch/229921/
State New
Headers show

Comments

Kai Tietz - March 22, 2013, 8:39 a.m.
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  <ktietz@redhat.com>

	* 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

Patch

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 */