X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=81e3f3cc61f9f418bc9594c58b610ee33f1c1b35;hb=83d563cb9ede0ba792836e529b1e2929db926355;hp=cb10cc9461d00e4184ddd240ab0e9674f597a2b2;hpb=2a4cd5365060c75d474af1532cd3ebb8ddc94996;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index cb10cc9..81e3f3c 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -354,15 +354,6 @@ typedef struct _RtsSymbolVal {
 #define RTS_POSIX_ONLY_SYMBOLS  /**/
 #define RTS_CYGWIN_ONLY_SYMBOLS /**/
 
-/* Extra syms gen'ed by mingw-2's gcc-3.2: */
-#if __GNUC__>=3
-#define RTS_MINGW_EXTRA_SYMS                    \
-      SymI_NeedsProto(_imp____mb_cur_max)       \
-      SymI_NeedsProto(_imp___pctype)
-#else
-#define RTS_MINGW_EXTRA_SYMS
-#endif
-
 #if HAVE_GETTIMEOFDAY
 #define RTS_MINGW_GETTIMEOFDAY_SYM SymI_NeedsProto(gettimeofday)
 #else
@@ -463,11 +454,14 @@ typedef struct _RtsSymbolVal {
       SymI_NeedsProto(opendir)                           \
       SymI_NeedsProto(readdir)                           \
       SymI_NeedsProto(rewinddir)                         \
-      RTS_MINGW_EXTRA_SYMS                               \
+      SymI_NeedsProto(_imp____mb_cur_max)	         \
+      SymI_NeedsProto(_imp___pctype)	         	 \
+      SymI_NeedsProto(__chkstk)				 \
       RTS_MINGW_GETTIMEOFDAY_SYM		         \
       SymI_NeedsProto(closedir)
 #endif
 
+
 #if defined(darwin_HOST_OS) && HAVE_PRINTF_LDBLSTUB
 #define RTS_DARWIN_ONLY_SYMBOLS			            \
      SymI_NeedsProto(asprintf$LDBLStub)                     \
@@ -1738,7 +1732,7 @@ loadArchive( char *path )
 
        isObject = 0;
        for (n = 0; n < (int)fileNameSize - 1; n++) {
-           if ((file[n] == '.') && (file[n] == 'o')) {
+           if ((file[n] == '.') && (file[n + 1] == 'o')) {
                isObject = 1;
                break;
            }