diff --git a/contrib/sdk/sources/Mesa/Makefile b/contrib/sdk/sources/Mesa/Makefile
index 4eca784947..2022948b98 100644
--- a/contrib/sdk/sources/Mesa/Makefile
+++ b/contrib/sdk/sources/Mesa/Makefile
@@ -4,12 +4,11 @@ EGL = egl
 CC = gcc
 
 CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -O2 -march=i686 -msse2
-CFLAGS_OPT+= -fomit-frame-pointer -fno-builtin-printf -mno-stack-arg-probe
-CFLAGS_OPT+= -mpreferred-stack-boundary=2 -mincoming-stack-boundary=2 -mno-ms-bitfields -flto
+CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields
 CFLAGS   = -c $(CFLAGS_OPT)
 
 LD = ld
-LDFLAGS = -nostdlib,-shared,-s,--image-base,0,-T,../newlib/dll.lds,--out-implib,lib$(EGL).dll.a,-e,_DllStartup
+LDFLAGS = -nostdlib -shared -s --image-base 0 -T ../newlib/dll.lds --out-implib lib$(EGL).dll.a -e _DllStartup
 
 STRIP = $(PREFIX)strip
 
@@ -58,7 +57,7 @@ EGL_OBJS     = $(patsubst %.c, %.o, $(EGL_SRC))
 all:$(EGL).dll
 
 $(EGL).dll: $(EGL_OBJS) Makefile
-	$(CC) $(CFLAGS_OPT) -fwhole-program -nostdlib -Wl,$(LIBPATH),$(LDFLAGS) -o $@ egl.def $(EGL_OBJS) $(LIBS)
+	$(LD) $(LDFLAGS) $(LIBPATH) -o $@ egl.def $(EGL_OBJS) $(LIBS)
 	$(STRIP) $@
 #	sed -e "s/ @[^ ]*//" egl1.def > egl.def
 	mv -f $@ ../../bin
diff --git a/contrib/sdk/sources/ffmpeg/config.mak b/contrib/sdk/sources/ffmpeg/config.mak
index 5750685e95..d3ec3a0f3c 100644
--- a/contrib/sdk/sources/ffmpeg/config.mak
+++ b/contrib/sdk/sources/ffmpeg/config.mak
@@ -34,7 +34,7 @@ STRIP=strip
 CP=cp -p
 LN_S=ln -s -f
 CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=32 -D_LARGEFILE_SOURCE -U__STRICT_ANSI__
-CFLAGS=  -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
+CFLAGS=  -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -march=pentium-mmx -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
 ASFLAGS=  -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__
 AS_C=-c
diff --git a/contrib/sdk/sources/libdrm/include/drm/i915_drm.h b/contrib/sdk/sources/libdrm/include/drm/i915_drm.h
index 6feae6a38b..584d9c2aae 100644
--- a/contrib/sdk/sources/libdrm/include/drm/i915_drm.h
+++ b/contrib/sdk/sources/libdrm/include/drm/i915_drm.h
@@ -977,6 +977,8 @@ struct drm_i915_fb_info {
     __u32 height;
     __u32 pitch;
     __u32 tiling;
+    __u32 crtc;
+    __u32 pipe;
 };
 
 #endif				/* _I915_DRM_H_ */
diff --git a/contrib/sdk/sources/newlib/crt/dllstart.c b/contrib/sdk/sources/newlib/crt/dllstart.c
index 9c97996991..c53ba36c60 100644
--- a/contrib/sdk/sources/newlib/crt/dllstart.c
+++ b/contrib/sdk/sources/newlib/crt/dllstart.c
@@ -15,7 +15,7 @@ static void __do_global_ctors ()
     }
 }
 
-int DllStartup(void *module, int reason)
+int __attribute__((externally_visible)) DllStartup(void *module, int reason)
 {
     if(reason == 1)
     {
diff --git a/contrib/sdk/sources/newlib/pe/loader.c b/contrib/sdk/sources/newlib/pe/loader.c
index 4f0e69fb9e..ade5ed2a70 100644
--- a/contrib/sdk/sources/newlib/pe/loader.c
+++ b/contrib/sdk/sources/newlib/pe/loader.c
@@ -750,6 +750,8 @@ module_t* load_library(const char *name)
         }
     };
 
+//    printf("module %s %p - %p\n", name, module->start, module->end);
+
     return module;
 
 err2: