Merge commit 'origin/gallium-0.1'

Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
	src/gallium/auxiliary/util/u_tile.c

2 files changed, 2 insertions, 2 deletions

diff --git a/scons/gallium.py b/scons/gallium.py
index d20d02ca208..ee221103117 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -473,7 +473,7 @@ def generate(env):
 
             '/entry:DrvEnableDriver',
         ]
-        if env['profile']:
+        if env['debug'] or env['profile']:
             linkflags += [
                 '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
             ]
diff --git a/scons/generic.py b/scons/generic.py
index 7592222fd6a..def2e415d50 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -552,7 +552,7 @@ def generate(env):
 
             '/entry:DrvEnableDriver',
         ]
-        if env['profile']:
+        if env['debug'] or env['profile']:
             linkflags += [
                 '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
             ]