From 4d4ee85673b79c59810bd8eecb2ef1ab72e3d7d1 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Thu, 30 Apr 2015 01:10:04 +0000 Subject: [PATCH] ICU-11659 Remove remnants of ICU_USE_THREADS X-SVN-Rev: 37415 --- icu4c/source/configure | 128 ++++++++++++------------ icu4c/source/configure.ac | 112 ++++++++++----------- icu4c/source/test/intltest/intltest.cpp | 4 - icu4c/source/test/intltest/intltest.h | 19 +--- 4 files changed, 117 insertions(+), 146 deletions(-) diff --git a/icu4c/source/configure b/icu4c/source/configure index 9f02e91663d..589e1a6b954 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ICU 55.1. +# Generated by GNU Autoconf 2.69 for ICU 56.0.1. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='55.1' -PACKAGE_STRING='ICU 55.1' +PACKAGE_VERSION='56.0.1' +PACKAGE_STRING='ICU 56.0.1' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ICU 55.1 to adapt to many kinds of systems. +\`configure' configures ICU 56.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1410,7 +1410,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 55.1:";; + short | recursive ) echo "Configuration of ICU 56.0.1:";; esac cat <<\_ACEOF @@ -1542,14 +1542,14 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 55.1 +ICU configure 56.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. - Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. + Copyright (c) 1999-2015, International Business Machines Corporation and others. All Rights Reserved. _ACEOF exit fi @@ -2234,7 +2234,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ICU $as_me 55.1, which was +It was created by ICU $as_me 56.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5968,18 +5968,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Always build ICU with multi-threading support. -threads=true -ICU_USE_THREADS=1 OLD_LIBS=${LIBS} -if test $threads = true; then - # For Compaq Tru64 (OSF1), we must look for pthread_attr_init - # and must do this before seaching for pthread_mutex_destroy, or - # we will pick up libpthreads.so not libpthread.so - # If this fails, then we must test for HPUX specials, before - # moving on to a more generic test +# For Compaq Tru64 (OSF1), we must look for pthread_attr_init +# and must do this before seaching for pthread_mutex_destroy, or +# we will pick up libpthreads.so not libpthread.so +# If this fails, then we must test for HPUX specials, before +# moving on to a more generic test - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5 $as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_attr_init+:} false; then : $as_echo_n "(cached) " >&6 @@ -6024,14 +6021,14 @@ _ACEOF fi - if test $ac_cv_lib_pthread_pthread_attr_init = yes; then - ICU_USE_THREADS=1 - else - # Locate the right library for POSIX threads. We look for the - # symbols in the libraries first, because on Solaris libc provides - # pthread_create but libpthread has the real code :( - # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread - # FreeBSD users may need libpthread if they do not have libc_r. +if test $ac_cv_lib_pthread_pthread_attr_init = yes; then + : +else + # Locate the right library for POSIX threads. We look for the + # symbols in the libraries first, because on Solaris libc provides + # pthread_create but libpthread has the real code :( + # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread + # FreeBSD users may need libpthread if they do not have libc_r. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutex_destroy" >&5 @@ -6104,11 +6101,11 @@ else : fi - if test "$ac_cv_search_pthread_mutex_destroy" != no; then - ICU_USE_THREADS=1 - else - # For HP 11 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5 + if test "$ac_cv_search_pthread_mutex_destroy" != no; then + : + else + # For HP 11 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5 $as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then : $as_echo_n "(cached) " >&6 @@ -6153,51 +6150,50 @@ _ACEOF fi - if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then - ICU_USE_THREADS=1 - fi + if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then + : fi + fi - ac_fn_c_check_func "$LINENO" "pthread_mutex_lock" "ac_cv_func_pthread_mutex_lock" + ac_fn_c_check_func "$LINENO" "pthread_mutex_lock" "ac_cv_func_pthread_mutex_lock" if test "x$ac_cv_func_pthread_mutex_lock" = xyes; then : fi - if test $ac_cv_func_pthread_mutex_lock = yes; then - ICU_USE_THREADS=1 - fi + if test $ac_cv_func_pthread_mutex_lock = yes; then + : fi - # Check to see if we are using CygWin with MSVC - case "${host}" in - *-pc-cygwin*|*-pc-mingw*) - # For gcc, the thread options are set by mh-mingw/mh-cygwin - # For msvc, the thread options are set by runConfigureICU - ICU_USE_THREADS=1 - ;; - *-*-hpux*) - # Add -mt because it does several nice things on newer compilers. - case "${icu_cv_host_frag}" in - mh-hpux-acc) - OLD_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${CXXFLAGS} -mt" - if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then - CXXFLAGS="${OLD_CXXFLAGS}" - else - UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt" - fi - ;; - esac +fi +# Check to see if we are using CygWin with MSVC +case "${host}" in +*-pc-cygwin*|*-pc-mingw*) + # For gcc, the thread options are set by mh-mingw/mh-cygwin + # For msvc, the thread options are set by runConfigureICU + : + ;; +*-*-hpux*) + # Add -mt because it does several nice things on newer compilers. + case "${icu_cv_host_frag}" in + mh-hpux-acc) + OLD_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -mt" + if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then + CXXFLAGS="${OLD_CXXFLAGS}" + else + UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt" + fi ;; - *-*-solaris*) - case "${icu_cv_host_frag}" in - mh-solaris) - LIBS="${LIBS} -mt" - ;; - esac + esac + ;; +*-*-solaris*) + case "${icu_cv_host_frag}" in + mh-solaris) + LIBS="${LIBS} -mt" ;; esac -fi + ;; +esac # Check whether --enable-weak-threads was given. if test "${enable_weak_threads+set}" = set; then : @@ -8264,7 +8260,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ICU $as_me 55.1, which was +This file was extended by ICU $as_me 56.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8318,7 +8314,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ICU config.status 55.1 +ICU config.status 56.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac index b30c8d0313e..22ebf2816d1 100644 --- a/icu4c/source/configure.ac +++ b/icu4c/source/configure.ac @@ -1,5 +1,5 @@ # -*-autoconf-*- -AC_COPYRIGHT([ Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. ]) +AC_COPYRIGHT([ Copyright (c) 1999-2015, International Business Machines Corporation and others. All Rights Reserved. ]) # configure.in for ICU # Stephen F. Booth, heavily modified by Yves and others @@ -519,75 +519,71 @@ AC_SUBST(U_HAVE_ATOMIC) AC_LANG_POP([C++]) # Always build ICU with multi-threading support. -threads=true -ICU_USE_THREADS=1 OLD_LIBS=${LIBS} -if test $threads = true; then - # For Compaq Tru64 (OSF1), we must look for pthread_attr_init - # and must do this before seaching for pthread_mutex_destroy, or - # we will pick up libpthreads.so not libpthread.so - # If this fails, then we must test for HPUX specials, before - # moving on to a more generic test +# For Compaq Tru64 (OSF1), we must look for pthread_attr_init +# and must do this before seaching for pthread_mutex_destroy, or +# we will pick up libpthreads.so not libpthread.so +# If this fails, then we must test for HPUX specials, before +# moving on to a more generic test - AC_CHECK_LIB(pthread, pthread_attr_init) - if test $ac_cv_lib_pthread_pthread_attr_init = yes; then - ICU_USE_THREADS=1 - else - # Locate the right library for POSIX threads. We look for the - # symbols in the libraries first, because on Solaris libc provides - # pthread_create but libpthread has the real code :( - # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread - # FreeBSD users may need libpthread if they do not have libc_r. +AC_CHECK_LIB(pthread, pthread_attr_init) +if test $ac_cv_lib_pthread_pthread_attr_init = yes; then + : +else + # Locate the right library for POSIX threads. We look for the + # symbols in the libraries first, because on Solaris libc provides + # pthread_create but libpthread has the real code :( + # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread + # FreeBSD users may need libpthread if they do not have libc_r. - AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r ) + AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r ) - if test "$ac_cv_search_pthread_mutex_destroy" != no; then - ICU_USE_THREADS=1 - else - # For HP 11 - AC_CHECK_LIB(pthread, pthread_mutex_init) - if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then - ICU_USE_THREADS=1 - fi + if test "$ac_cv_search_pthread_mutex_destroy" != no; then + : + else + # For HP 11 + AC_CHECK_LIB(pthread, pthread_mutex_init) + if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then + : fi + fi - AC_CHECK_FUNC(pthread_mutex_lock) + AC_CHECK_FUNC(pthread_mutex_lock) - if test $ac_cv_func_pthread_mutex_lock = yes; then - ICU_USE_THREADS=1 - fi + if test $ac_cv_func_pthread_mutex_lock = yes; then + : fi - # Check to see if we are using CygWin with MSVC - case "${host}" in - *-pc-cygwin*|*-pc-mingw*) - # For gcc, the thread options are set by mh-mingw/mh-cygwin - # For msvc, the thread options are set by runConfigureICU - ICU_USE_THREADS=1 - ;; - *-*-hpux*) - # Add -mt because it does several nice things on newer compilers. - case "${icu_cv_host_frag}" in - mh-hpux-acc) - OLD_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${CXXFLAGS} -mt" - if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then - CXXFLAGS="${OLD_CXXFLAGS}" - else - UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt" - fi - ;; - esac +fi +# Check to see if we are using CygWin with MSVC +case "${host}" in +*-pc-cygwin*|*-pc-mingw*) + # For gcc, the thread options are set by mh-mingw/mh-cygwin + # For msvc, the thread options are set by runConfigureICU + : + ;; +*-*-hpux*) + # Add -mt because it does several nice things on newer compilers. + case "${icu_cv_host_frag}" in + mh-hpux-acc) + OLD_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -mt" + if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then + CXXFLAGS="${OLD_CXXFLAGS}" + else + UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt" + fi ;; - *-*-solaris*) - case "${icu_cv_host_frag}" in - mh-solaris) - LIBS="${LIBS} -mt" - ;; - esac + esac + ;; +*-*-solaris*) + case "${icu_cv_host_frag}" in + mh-solaris) + LIBS="${LIBS} -mt" ;; esac -fi + ;; +esac AC_ARG_ENABLE(weak-threads, [ --enable-weak-threads weakly reference the threading library [default=no]], diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index 3b821540c29..b40d37feed2 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -1336,11 +1336,7 @@ main(int argc, char* argv[]) fprintf(stdout, " notime (T) : %s\n", (no_time? "On" : "Off")); fprintf(stdout, " noknownissues (K) : %s\n", (noKnownIssues? "On" : "Off")); fprintf(stdout, " Warn on missing data (w) : %s\n", (warnOnMissingData? "On" : "Off")); -#if (ICU_USE_THREADS==0) - fprintf(stdout, " Threads : Disabled\n"); -#else fprintf(stdout, " Threads : %d\n", threadCount); -#endif for (int32_t i = 0; i < nProps; i++) { fprintf(stdout, " Custom property (prop:) : %s\n", props[i]); } diff --git a/icu4c/source/test/intltest/intltest.h b/icu4c/source/test/intltest/intltest.h index 877499a945f..667685ec309 100644 --- a/icu4c/source/test/intltest/intltest.h +++ b/icu4c/source/test/intltest/intltest.h @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2014, International Business Machines Corporation and + * Copyright (c) 1997-2015, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -21,23 +21,6 @@ #include "unicode/utf_old.h" #endif -/** - * \def ICU_USE_THREADS - * - * Enables multi-threaded testing. Moved here from uconfig.h. - * Default: enabled - * - * This switch used to allow thread support (use of mutexes) to be compiled out of ICU. - */ -#ifdef ICU_USE_THREADS - /* Use the predefined value. */ -#elif defined(APP_NO_THREADS) - /* APP_NO_THREADS is an old symbol. We'll honour it if present. */ -# define ICU_USE_THREADS 0 -#else -# define ICU_USE_THREADS 1 -#endif - U_NAMESPACE_USE #if U_PLATFORM == U_PF_OS390 -- 2.40.0