diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-14 18:45:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-14 18:45:02 +0000 |
| commit | cc6f9aab3fbb91aae284a0ca407b97ec001e4617 (patch) | |
| tree | 97585ac9a6ad963537e50939ed61764013ce8904 | |
| parent | 95796e8e50657b9d2c07b2092dcd6e2b4870d089 (diff) | |
| download | ATCD-cc6f9aab3fbb91aae284a0ca407b97ec001e4617.tar.gz | |
Tue Aug 14 18:44:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_icc.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_pgi.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_suncc.GNU | 5 |
5 files changed, 29 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 67311c04114..3d5acc192de 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Aug 14 18:44:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux.GNU: + * include/makeinclude/platform_linux_icc.GNU: + * include/makeinclude/platform_linux_pgi.GNU: + * include/makeinclude/platform_linux_suncc.GNU: + Added a check whether we run on a kernel with NPTL. If this is the case + we add ACE_HAS_LINUX_NPTL to the compiler flags + Tue Aug 14 18:06:16 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * ace/Svc_Conf_y.cpp: diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 2f046ec6aa2..cebda1deefa 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -116,6 +116,11 @@ ifeq ($(optimize),1) SOFLAGS += -Wl,-O3 endif +GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) +ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) + CPPFLAGS += -DACE_HAS_LINUX_NPTL +endif + PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include PLATFORM_QT_LIBS ?= -lqt-mt PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU index b0c0f4a10a7..63f8d82cd8e 100644 --- a/ACE/include/makeinclude/platform_linux_icc.GNU +++ b/ACE/include/makeinclude/platform_linux_icc.GNU @@ -53,6 +53,11 @@ PLATFORM_TK_LDFLAGS= PLATFORM_AIO_SUPPORT := \ $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS) +GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) +ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) + CPPFLAGS += -DACE_HAS_LINUX_NPTL +endif + SYSARCH := $(shell uname -m) ssl ?= 0 ifeq ($(ssl),1) diff --git a/ACE/include/makeinclude/platform_linux_pgi.GNU b/ACE/include/makeinclude/platform_linux_pgi.GNU index 88c4b3c652f..b3d654c8edd 100644 --- a/ACE/include/makeinclude/platform_linux_pgi.GNU +++ b/ACE/include/makeinclude/platform_linux_pgi.GNU @@ -55,6 +55,11 @@ ifeq ($(threads),1) CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT) endif # threads +GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) +ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) + CPPFLAGS += -DACE_HAS_LINUX_NPTL +endif + CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) DCFLAGS += -g DLD = $(CXX) diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU index 43a4e839868..36b99ebcb86 100644 --- a/ACE/include/makeinclude/platform_linux_suncc.GNU +++ b/ACE/include/makeinclude/platform_linux_suncc.GNU @@ -60,6 +60,11 @@ ifeq ($(threads),1) CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT) endif # threads +GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) +ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) + CPPFLAGS += -DACE_HAS_LINUX_NPTL +endif + CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) DCFLAGS += -g DLD = $(CXX) |