Mercurial > hg > release > icedtea7-forest-2.5 > jdk

changeset 7284:35172a51cc76 ppc-aix-port-b01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Export 'USE_PTHREADS' on Linux trough CPPFLAGS to fix the build because java_md_solinux.c now only relies on 'USE_PTHREADS' beeing defined.
author simonis
date Mon, 16 Jul 2012 19:54:07 +0200
parents 197aef0b114c
children 2b08753d69a8
files make/common/Defs-linux.gmk src/solaris/bin/java_md_solinux.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk	Fri Jul 13 09:01:31 2012 +0100
+++ b/make/common/Defs-linux.gmk	Mon Jul 16 19:54:07 2012 +0200
@@ -305,6 +305,9 @@
 CPPFLAGS_COMMON += -D_LP64=1
 endif
 
+# turn on USE_PTHREADS
+CPPFLAGS_COMMON += -DUSE_PTHREADS
+
 CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG
 ifneq ($(PRODUCT), java)
--- a/src/solaris/bin/java_md_solinux.c	Fri Jul 13 09:01:31 2012 +0100
+++ b/src/solaris/bin/java_md_solinux.c	Mon Jul 16 19:54:07 2012 +0200
@@ -1006,7 +1006,7 @@
     }
 
     pthread_attr_destroy(&attr);
-#else /* ! __linux__ */
+#else /* ! USE_PTHREADS */
     thread_t tid;
     long flags = 0;
     if (thr_create(NULL, stack_size, (void *(*)(void *))continuation, args, flags, &tid) == 0) {
@@ -1017,7 +1017,7 @@
       /* See above. Continue in current thread if thr_create() failed */
       rslt = continuation(args);
     }
-#endif /* __linux__ */
+#endif /* USE_PTHREADS */
     return rslt;
 }