diff options
| author | Ian Romanick <[email protected]> | 2010-04-04 16:54:00 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-04-04 16:54:00 -0700 |
| commit | 4fb2daf42c8171579cdc18605c5ceeb1963f8b31 (patch) | |
| tree | da534f83de94161df440986ad5e36df245291552 /src/gallium | |
| parent | ad3575e2dd81252e9ea341d1a7355e0bfd1cccee (diff) | |
| parent | f66733e0773b4ec794438dd2422aeb28a791adda (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/util/u_atomic.h | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vega/Makefile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_atomic.h b/src/gallium/auxiliary/util/u_atomic.h index 3c42477ad4f..a1568233906 100644 --- a/src/gallium/auxiliary/util/u_atomic.h +++ b/src/gallium/auxiliary/util/u_atomic.h @@ -29,7 +29,7 @@ #define PIPE_ATOMIC_ASM_MSVC_X86 #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)) #define PIPE_ATOMIC_ASM_GCC_X86 -#elif defined(PIPE_CC_GCC) +#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401) #define PIPE_ATOMIC_GCC_INTRINSIC #else #error "Unsupported platform" diff --git a/src/gallium/state_trackers/vega/Makefile b/src/gallium/state_trackers/vega/Makefile index 7c315de8271..8b5a31cf315 100644 --- a/src/gallium/state_trackers/vega/Makefile +++ b/src/gallium/state_trackers/vega/Makefile @@ -43,7 +43,8 @@ VG_SOURCES = \ VG_OBJECTS = $(VG_SOURCES:.c=.o) -VG_LIBS = $(GALLIUM_AUXILIARIES) -lm +VG_LIBS = $(GALLIUM_AUXILIARIES) +VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lm ### Include directories @@ -65,7 +66,7 @@ $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME): $(VG_OBJECTS) $(VG_LIBS) -minor $(VG_MINOR) \ -patch $(VG_TINY) \ -install $(TOP)/$(LIB_DIR) \ - $(VG_OBJECTS) $(VG_LIBS) + $(VG_OBJECTS) $(VG_LIBS) $(VG_LIB_DEPS) ###################################################################### # Generic stuff |