On Sunday 30 May 2004 02:59, Kevin Koltzau wrote:
> This patch
> http://cvs.winehq.org/patch.py?id=12495
> seems to have broken the mingw build, currently getting
Are you saying you could build Wine with MinGW before this patch?
> i386-mingw32msvc-gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__
> -D_REENTRANT -Wall -pipe -fno-strength-reduce -mpreferred-stack-boundary=2
> -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o interlocked.o interlocked.c
> {standard input}: Assembler messages:
> {standard input}:124: Error: unknown pseudo-op: `.previous'
> {standard input}:135: Error: unknown pseudo-op: `.previous'
> {standard input}:145: Error: unknown pseudo-op: `.previous'
> {standard input}:155: Error: unknown pseudo-op: `.previous'
> {standard input}:165: Error: unknown pseudo-op: `.previous'
> make[2]: *** [interlocked.o] Error 1
I suspect .previous is ELF specific? Don't know if it's worth fixing
this since AFAICS this code is about portability toward Unix platforms
and now we're trying to build PE executables from it with MinGW. Cygwin
might be an interesting target in this respect though.
-Hans
Changelog:
MinGW portability fix.
Index: include/wine/port.h
===================================================================
RCS file: /home/wine/wine/include/wine/port.h,v
retrieving revision 1.55
diff -u -r1.55 port.h
--- include/wine/port.h 29 May 2004 00:26:04 -0000 1.55
+++ include/wine/port.h 1 Jun 2004 07:42:36 -0000
@@ -188,7 +188,7 @@
/* Macros to define assembler functions somewhat portably */
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__MINGW32__)
# define __ASM_GLOBAL_FUNC(name,code) \
__asm__( ".text\n\t" \
".align 4\n\t" \
@@ -197,7 +197,7 @@
__ASM_NAME(#name) ":\n\t" \
code \
"\n\t.previous" );
-#else /* __GNUC__ */
+#else /* defined(__GNUC__) && !defined(__MINGW32__) */
# define __ASM_GLOBAL_FUNC(name,code) \
void __asm_dummy_##name(void) { \
asm( ".align 4\n\t" \
