diff options
| -rw-r--r-- | scons/udis86.py | 42 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_debug.c | 6 | ||||
| -rw-r--r-- | src/gallium/winsys/xlib/SConscript | 2 |
4 files changed, 50 insertions, 2 deletions
diff --git a/scons/udis86.py b/scons/udis86.py new file mode 100644 index 0000000000..ba71d4eb0b --- /dev/null +++ b/scons/udis86.py @@ -0,0 +1,42 @@ +"""udis86 + +Tool-specific initialization for udis86 + +""" + +# +# Copyright (c) 2009 VMware, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +def generate(env): + conf = env.Configure() + + if conf.CheckHeader('udis86.h'): # and conf.CheckLib('udis86'): + env.Append(CPPDEFINES = [('HAVE_UDIS86', '1')]) + env.Prepend(LIBS = ['udis86']) + + conf.Finish() + +def exists(env): + return True + +# vim:set ts=4 sw=4 et: diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index b880ca0d68..97af1b95c3 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -2,6 +2,7 @@ Import('*') env = env.Clone() +env.Tool('udis86') env.ParseConfig('llvm-config --cppflags') llvmpipe = env.ConvenienceLibrary( @@ -57,7 +58,6 @@ llvmpipe = env.ConvenienceLibrary( env = env.Clone() -env.Prepend(LIBS = 'udis86') env['LINK'] = env['CXX'] env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter') env.Prepend(LIBS = [llvmpipe] + auxiliaries) diff --git a/src/gallium/drivers/llvmpipe/lp_bld_debug.c b/src/gallium/drivers/llvmpipe/lp_bld_debug.c index f8da1c9f8e..ccbafca8b8 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_debug.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_debug.c @@ -26,7 +26,9 @@ **************************************************************************/ +#ifdef HAVE_UDIS86 #include <udis86.h> +#endif #include "util/u_debug.h" #include "lp_bld_debug.h" @@ -35,6 +37,7 @@ void lp_disassemble(const void* func) { +#ifdef HAVE_UDIS86 ud_t ud_obj; ud_init(&ud_obj); @@ -69,4 +72,7 @@ lp_disassemble(const void* func) break; } debug_printf("\n"); +#else + (void)func; +#endif } diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript index d2be07b384..518fd2b5a8 100644 --- a/src/gallium/winsys/xlib/SConscript +++ b/src/gallium/winsys/xlib/SConscript @@ -31,7 +31,7 @@ if env['platform'] == 'linux' \ if 'llvmpipe' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') - env.Prepend(LIBS = 'udis86') + env.Tool('udis86') env.ParseConfig('llvm-config --libs jit interpreter nativecodegen') env['LINK'] = env['CXX'] sources += ['xlib_llvmpipe.c'] |