configure.ac | 10 +++++----- debian/rules | 3 --- src/gallium/Makefile.template | 2 +- src/gallium/auxiliary/rtasm/rtasm_execmem.c | 2 +- src/gallium/drivers/llvmpipe/Makefile | 3 ++- src/gallium/include/pipe/p_config.h | 2 +- src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++- src/mapi/glapi/gen/gl_x86-64_asm.py | 13 ------------- src/mapi/glapi/gen/gl_x86_asm.py | 14 -------------- src/mesa/drivers/osmesa/Makefile.am | 1 + src/mesa/main/compiler.h | 3 ++- 11 files changed, 15 insertions(+), 41 deletions(-)
New commits: commit e615ac0e1b846eb1fe4549fd8aae1c0b0b046dd7 Author: Steve Langasek <[email protected]> Date: Tue Aug 21 23:48:47 2012 -0700 Drop the EXTRA_SED stuff, not needed now that we've normalized the .install file diff --git a/configure.ac b/configure.ac index 7dac091..ee19d0a 100644 --- a/configure.ac +++ b/configure.ac @@ -448,7 +448,7 @@ if test "x$enable_asm" = xyes; then case "$host_cpu" in i?86) case "$host_os" in - linux* | *freebsd* | dragonfly* | *netbsd*) + linux* | *freebsd* | dragonfly* | *netbsd* | gnu*) test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86 ;; esac @@ -1103,7 +1103,7 @@ if test "x$enable_dri" = xyes; then ;; esac ;; - freebsd* | dragonfly* | *netbsd*) + freebsd* | dragonfly* | *netbsd* | kfreebsd*-gnu*) DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" @@ -1268,7 +1268,7 @@ if test "x$enable_osmesa" = xyes; then OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" fi -OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'` +OSMESA_VERSION="6:5:3" AC_SUBST([OSMESA_LIB_DEPS]) AC_SUBST([OSMESA_MESA_DEPS]) @@ -1765,9 +1765,9 @@ if test "x$enable_gallium_llvm" = xauto; then fi if test "x$enable_gallium_llvm" = xyes; then if test "x$llvm_prefix" != x; then - AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"]) + AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no], ["$llvm_prefix/bin"]) else - AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) + AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no]) fi if test "x$LLVM_CONFIG" != xno; then diff --git a/debian/rules b/debian/rules index 65aeedc..00fef97 100755 --- a/debian/rules +++ b/debian/rules @@ -79,8 +79,6 @@ else # Radeonsi needs LLVM, so only build it on the subset of archs # where we have LLVM enabled. GALLIUM_DRIVERS += radeonsi - else - EXTRA_SED=-e"/radeonsi_dri.so/ s/^/\#/" endif endif @@ -180,7 +178,6 @@ install: build for file in debian/*.in; \ do \ sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \ - $(EXTRA_SED) \ $${file} > $${file%%.in}; \ done diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template index 036c119..c30477a 100644 --- a/src/gallium/Makefile.template +++ b/src/gallium/Makefile.template @@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURC $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null $(PROGS): % : %.o $(PROGS_DEPS) - $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group + $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group $(LDADD) # Emacs tags tags: diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index fbde1d1..4509553 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -37,7 +37,7 @@ #include "rtasm_execmem.h" -#if defined(PIPE_OS_BSD) +#ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile index ef16fc7..35f8fe8 100644 --- a/src/gallium/drivers/llvmpipe/Makefile +++ b/src/gallium/drivers/llvmpipe/Makefile @@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxil $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@ LDFLAGS += $(LLVM_LDFLAGS) -LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS) +LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a +LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS) LD=$(CXX) $(PROGS): lp_test_main.o libllvmpipe.a diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index d63eccd..a3c02aa 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -171,7 +171,7 @@ #define PIPE_OS_ANDROID #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define PIPE_OS_FREEBSD #define PIPE_OS_BSD #define PIPE_OS_UNIX diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile index 32d2956..f9cad05 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile +++ b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile @@ -3,5 +3,6 @@ CPP_SOURCES=$(wildcard *.cpp) LIBRARY_INCLUDES=-Iinclude -I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../d3d1xshader/include -I../../../include -I../../../auxiliary -I../../../state_trackers/egl/common PROGS=tools/dxbc2tgsi PROGS_DEPS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a ../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a -LIBS=$(PROGS_DEPS) -ldl +LIBS=$(PROGS_DEPS) +LDADD=-ldl include ../Makefile.inc diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py index ef759bf..453733b 100644 --- a/src/mapi/glapi/gen/gl_x86-64_asm.py +++ b/src/mapi/glapi/gen/gl_x86-64_asm.py @@ -181,19 +181,6 @@ class PrintGenericStubs(gl_XML.gl_print_base): def printRealFooter(self): print '' - print '#if defined(GLX_USE_TLS) && defined(__linux__)' - print ' .section ".note.ABI-tag", "a"' - print ' .p2align 2' - print ' .long 1f - 0f /* name length */' - print ' .long 3f - 2f /* data length */' - print ' .long 1 /* note length */' - print '0: .asciz "GNU" /* vendor name */' - print '1: .p2align 2' - print '2: .long 0 /* note data: the ABI tag */' - print ' .long 2,4,20 /* Minimum kernel version w/TLS */' - print '3: .p2align 2 /* pad out section */' - print '#endif /* GLX_USE_TLS */' - print '' print '#if defined (__ELF__) && defined (__linux__)' print ' .section .note.GNU-stack,"",%progbits' print '#endif' diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py index b43b65d..edb713e 100644 --- a/src/mapi/glapi/gen/gl_x86_asm.py +++ b/src/mapi/glapi/gen/gl_x86_asm.py @@ -176,7 +176,6 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '' print '\t\tALIGNTEXT16' print '\t\tGLOBL GLNAME(gl_dispatch_functions_start)' - print '\t\tHIDDEN(GLNAME(gl_dispatch_functions_start))' print 'GLNAME(gl_dispatch_functions_start):' print '' return @@ -189,19 +188,6 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\t\tALIGNTEXT16' print 'GLNAME(gl_dispatch_functions_end):' print '' - print '#if defined(GLX_USE_TLS) && defined(__linux__)' - print ' .section ".note.ABI-tag", "a"' - print ' .p2align 2' - print ' .long 1f - 0f /* name length */' - print ' .long 3f - 2f /* data length */' - print ' .long 1 /* note length */' - print '0: .asciz "GNU" /* vendor name */' - print '1: .p2align 2' - print '2: .long 0 /* note data: the ABI tag */' - print ' .long 2,4,20 /* Minimum kernel version w/TLS */' - print '3: .p2align 2 /* pad out section */' - print '#endif /* GLX_USE_TLS */' - print '' print '#if defined (__ELF__) && defined (__linux__)' print ' .section .note.GNU-stack,"",%progbits' print '#endif' diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index adda0fd..16c6a01 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -28,6 +28,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_builddir)/src/mapi \ $(DEFINES) \ $(API_DEFINES) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index bfa06f3..1366576 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -363,8 +363,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) * USE_IEEE: Determine if we're using IEEE floating point */ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ - defined(__s390x__) || defined(__powerpc__) || \ + defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \ defined(__x86_64__) || \ + defined(__m68k__) || \ defined(ia64) || defined(__ia64__) || \ defined(__hppa__) || defined(hpux) || \ defined(__mips) || defined(_MIPS_ARCH) || \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
