Fix pthread compiler flags to work on Solaris and with Studio compiler

AC_USE_SYSTEM_EXTENSIONS is used to let autoconf take care of setting
the right system defintions for POSIX threads & similar extensions to
the base POSIX API.   Since it will also #define _GNU_SOURCE 1, remove
the extra setting to avoid compiler warnings about redefined macros.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Alan Coopersmith 2012-01-06 15:45:29 -08:00 committed by Daniel Vetter
parent 4e3c85f153
commit 504c4fa94f
3 changed files with 10 additions and 5 deletions

View File

@ -30,6 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_USE_SYSTEM_EXTENSIONS
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -44,10 +45,10 @@ AC_CHECK_MEMBERS([struct sysinfo.totalram],[],[],[AC_INCLUDES_DEFAULT
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS # Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8) XORG_MACROS_VERSION(1.16)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23 libdrm]) PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23 libdrm])
@ -87,6 +88,10 @@ if test "x$SHADER_DEBUGGER" = xyes; then
fi fi
fi fi
# To build multithread code, gcc uses -pthread, Solaris Studio cc uses -mt
XORG_TESTSET_CFLAG([THREAD_CFLAGS], [-pthread], [-mt])
AC_SUBST([THREAD_CFLAGS])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
benchmarks/Makefile benchmarks/Makefile

View File

@ -103,5 +103,5 @@ endif
endif endif
endif endif
gem_fence_thrash_CFLAGS = $(AM_CFLAGS) -pthread gem_fence_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
gem_fence_thrash_LDADD = $(LDADD) -lpthread gem_fence_thrash_LDADD = $(LDADD) -lpthread

View File

@ -26,7 +26,7 @@
* *
*/ */
#define _GNU_SOURCE #include "config.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>