From f9253bbb45cf4e83354ffde1e0e3f40fbaa3a286 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 21 Jul 2010 12:49:45 +0200
Subject: [PATCH] makefiles: Specify -nodefaultlibs when building low-level
 dlls.

---
 dlls/kernel32/Makefile.in      | 2 +-
 dlls/krnl386.exe16/Makefile.in | 4 ++--
 dlls/ntdll/Makefile.in         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index c145a00cc2f..1056174c389 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -7,7 +7,7 @@ MODULE    = kernel32.dll
 IMPORTLIB = kernel32
 IMPORTS   = ntdll
 EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
-EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
+EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
 
 C_SRCS = \
 	actctx.c \
diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in
index c85c200624f..0798e540530 100644
--- a/dlls/krnl386.exe16/Makefile.in
+++ b/dlls/krnl386.exe16/Makefile.in
@@ -6,8 +6,8 @@ MODULE    = krnl386.exe16
 IMPORTLIB = kernel
 IMPORTS   = kernel32 ntdll
 DELAYIMPORTS = ddraw dsound user32
-EXTRAIMPLIBFLAGS = --subsystem win16
-EXTRADLLFLAGS = -Wb,--subsystem,win16,--dll-name,kernel
+EXTRAIMPLIBFLAGS = -m16
+EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel
 EXTRARCFLAGS  = -O res16
 
 C_SRCS = \
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index c51776b01dc..885036e069f 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = ntdll.dll
 IMPORTLIB = ntdll
 EXTRALIBS = @IOKITLIB@ @LIBPTHREAD@
-EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
+EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
 
 C_SRCS = \
 	actctx.c \