diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
| commit | a1af8eec66c5f7ec421e8011b41c1a7c36319f9f (patch) | |
| tree | bc76a431699807cf60cf8ba82ff6b3b1ff34f309 /configs | |
| parent | c036d13d7d2cc905226fe53ebd86a18da808963f (diff) | |
| parent | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 (diff) | |
Merge remote branch 'origin/lp-binning'
Conflicts:
src/gallium/auxiliary/util/u_dl.c
src/gallium/auxiliary/util/u_time.h
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/linux-llvm | 8 | ||||
| -rw-r--r-- | configs/linux-llvm-debug | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/configs/linux-llvm b/configs/linux-llvm index dbf7e3ed7a..988b7057d4 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -1,5 +1,5 @@ # -*-makefile-*- -# Configuration for Linux and LLVM with debugging info +# Configuration for Linux and LLVM with optimizations # Builds the llvmpipe gallium driver include $(TOP)/configs/linux @@ -9,8 +9,10 @@ CONFIG_NAME = linux-llvm # Add llvmpipe driver GALLIUM_DRIVERS_DIRS += llvmpipe -OPT_FLAGS = -g -ansi -pedantic -DEFINES += -DDEBUG -DDEBUG_MATH -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 +OPT_FLAGS = -O3 -ansi -pedantic +ARCH_FLAGS = -m32 -mmmx -msse -msse2 -mstackrealign + +DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 # override -std=c99 CFLAGS += -std=gnu99 diff --git a/configs/linux-llvm-debug b/configs/linux-llvm-debug new file mode 100644 index 0000000000..28bcfdb187 --- /dev/null +++ b/configs/linux-llvm-debug @@ -0,0 +1,12 @@ +# -*-makefile-*- +# Configuration for Linux and LLVM with debugging info +# Builds the llvmpipe gallium driver + +include $(TOP)/configs/linux-llvm + +CONFIG_NAME = linux-llvm-debug + +OPT_FLAGS = -g -ansi -pedantic + +DEFINES += -DDEBUG -UNDEBUG + |