Ticket #583: boost_1_34_0_ibm.udiff

boost/date_time/date_generators.hpp

@@ -153 +153 @@
    month_type month_;
  };
 
+  //! Returns nth arg as string. 1 -> "first", 2 -> "second", max is 5.
+  BOOST_DATE_TIME_DECL const char* nth_as_str(int n);
 
   //! Useful generator functor for finding holidays
   /*! Based on the idea in Cal. Calc. for finding holidays that are
@@ -241 +243 @@
     week_num wn_;
     day_of_week_type dow_;
   };
-  
-  //! Returns nth arg as string. 1 -> "first", 2 -> "second", max is 5.
-  BOOST_DATE_TIME_DECL const char* nth_as_str(int n);
+
 
   //! Useful generator functor for finding holidays and daylight savings
   /*! Similar to nth_kday_of_month, but requires less paramters

boost/function.hpp

@@ -21 +21 @@
 // in anything that may be included by function_template.hpp doesn't break
 #include <boost/function/detail/prologue.hpp>
 
-// Visual Age C++ doesn't handle the file iteration well
-#if BOOST_WORKAROUND(__IBMCPP__, >= 500)
+// Older versions of the IBM C++ compiler do not handle file iterations well
+#if BOOST_WORKAROUND(__IBMCPP__, >= 500) && BOOST_WORKAROUND(__IBMCPP__, < 800)
 #  if BOOST_FUNCTION_MAX_ARGS >= 0
 #    include <boost/function/function0.hpp>
 #  endif

boost/numeric/interval/detail/ppc_rounding_control.hpp

@@ -51 +51 @@
 
 } // namespace detail
 
+// Do not declare the following C99 symbols if <math.h> is C99-compliant.
+// Otherwise, conflicts may occur, due to differences between prototypes.
+#if !defined(_ISOC99_SOURCE) && !defined(__USE_ISOC99)
 extern "C" {
   float rintf(float);
   double rint(double);
 }
+#endif
 
 template<>
 struct rounding_control<float>:

boost/python/module_init.hpp

@@ -26 +26 @@
 }                                                       \
 void init_module_##name()
 
-#  elif defined(_AIX) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
-#   include <boost/python/detail/aix_init_module.hpp>
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-void init_module_##name();                                              \
-extern "C"                                                              \
-{                                                                       \
-    extern PyObject* _PyImport_LoadDynamicModule(char*, char*, FILE *); \
-    void init##name()                                                   \
-    {                                                                   \
-        boost::python::detail::aix_init_module(                         \
-            _PyImport_LoadDynamicModule, #name, &init_module_##name);   \
-    }                                                                   \
-}                                                                       \
-void init_module_##name()
-
-# elif BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
+#  elif BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
 
 #   define BOOST_PYTHON_MODULE_INIT(name)                               \
 void init_module_##name();                                              \
@@ -52 +36 @@
 }                                                                       \
 void init_module_##name()
 
-# else
+#  else
 
 #   define BOOST_PYTHON_MODULE_INIT(name)                               \
 void init_module_##name();                                              \

boost/regex/v4/basic_regex.hpp

@@ -254 +254 @@
    {
       return do_assign(p1, p2, f);
    }
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
+#if !defined(BOOST_NO_MEMBER_TEMPLATES)
 
    template <class ST, class SA>
    unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
@@ -590 +590 @@
       return this->assign(that);
    }
 
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
+#if !defined(BOOST_NO_MEMBER_TEMPLATES)
    template <class ST, class SA>
    explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
    : basic_regex<charT, traits>(p, f)

boost/tr1/detail/config.hpp

@@ -34 +34 @@
 #     define BOOST_TR1_STD_HEADER(name) <../include/name>
 #  endif
 
-#if defined(__GNUC__) && !defined(BOOST_HAS_INCLUDE_NEXT)
-#  define BOOST_HAS_INCLUDE_NEXT
+#if defined(__GNUC__) || (!defined(_AIX) && defined(__IBMCPP__)  && __IBMCPP__ >= 800)
+#  ifndef BOOST_HAS_INCLUDE_NEXT
+#     define BOOST_HAS_INCLUDE_NEXT
+#  endif
 #endif
 
 // Can't use BOOST_WORKAROUND here, it leads to recursive includes:

libs/concept_check/stl_concept_covering.cpp

@@ -591 +591 @@
     std::nth_element(ri, ri, ri, comp);
   }
   {
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__IBMCPP__)
     typedef less_than_op_first_archetype<> FT;
     typedef less_than_op_second_archetype<> T;
 #elif defined(__KCC)
@@ -615 +615 @@
     fi = std::lower_bound(fi, fi, value, comp);
   }
   {
-#if defined(__GNUC__)
+#if defined(__GNUC__)  || defined(__IBMCPP__)
     // Note, order of T,FT is flipped from lower_bound
     typedef less_than_op_second_archetype<> FT;
     typedef less_than_op_first_archetype<> T;
@@ -639 +639 @@
     fi = std::upper_bound(fi, fi, value, comp);
   }
   {
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__IBMCPP__)
     typedef less_than_op_first_archetype<
       less_than_op_second_archetype< null_archetype<>, optag2>, optag1> FT;
     typedef less_than_op_second_archetype<
@@ -669 +669 @@
     ignore_unused_variable_warning(p);
   }
   {
-#if defined(__GNUC__)
+#if defined(__GNUC__)  || defined(__IBMCPP__)
     typedef less_than_op_first_archetype<
       less_than_op_second_archetype<null_archetype<>, optag2>, optag1> FT;
     typedef less_than_op_second_archetype<
@@ -686 +686 @@
   {
     typedef null_archetype<int> Arg1;
     typedef null_archetype<char> Arg2;
-#if defined(__GNUC__) || defined(__KCC)
+#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__)
     typedef convertible_to_archetype<Arg1,
       convertible_to_archetype<Arg2> > FT;
     typedef convertible_to_archetype<Arg2,
@@ -701 +701 @@
   }
   {
     typedef null_archetype<> Tout;
-#if defined(__GNUC__) || defined(__KCC)
+#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__)
     typedef less_than_op_first_archetype<
       less_than_op_second_archetype<
       convertible_to_archetype<Tout>, optag2>, optag1 > Tin1;

libs/filesystem/src/operations.cpp

@@ -17 +17 @@
 
 #define _POSIX_PTHREAD_SEMANTICS  // Sun readdir_r() needs this
 
+// enable the XPG-compliant version of readdir_r() on AIX
+#if defined(_AIX)
+# define _LINUX_SOURCE_COMPAT
+#endif
+
 #if !(defined(__HP_aCC) && defined(_ILP32) && \
       !defined(_STATVFS_ACPP_PROBLEMS_FIXED))
 # define _FILE_OFFSET_BITS 64 // at worst, these defines may have no effect,

libs/graph/src/graphviz_digraph_lex.cpp

@@ -1411 +1411 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
+/* Avoid conflicts if isatty() has a different prototype in <unistd.h>. */
+#if !defined(__IBMCPP__)
 extern int isatty YY_PROTO(( int ));
 #endif
 #endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )

libs/graph/src/graphviz_graph_lex.cpp

@@ -1411 +1411 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
+/* Avoid conflicts if isatty() has a different prototype in <unistd.h>. */
+#if !defined(__IBMCPP__)
 extern int isatty YY_PROTO(( int ));
 #endif
 #endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )

libs/mpl/test/integral_c.cpp

@@ -11 +11 @@
 // $Date: 2005/05/14 16:00:57 $
 // $Revision: 1.5 $
 
+#if defined(__IBMCPP__)
+#pragma options chars=signed
+#endif
+
 #include <boost/mpl/integral_c.hpp>
 #include <boost/preprocessor/repeat.hpp>
 

libs/python/test/select_from_python_test.cpp

@@ -5 +5 @@
 #include <boost/python/type_id.hpp>
 #include <iostream>
 
-// gcc 2.95.x and MIPSpro 7.3.1.3 linker seem to demand this definition
-#if ((defined(__GNUC__) && __GNUC__ < 3)) \
- || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238))
+// gcc 2.95.x, MIPSpro 7.3.1.3 and IBM XL for Linux linker seem to demand this definition
+#if (defined(__GNUC__) && (__GNUC__ < 3)) \
+ || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238)) \
+ || (defined(__IBMCPP__) && defined(__linux__))
 namespace boost { namespace python {
 BOOST_PYTHON_DECL bool handle_exception_impl(function0<void>)
 {

libs/test/test/prg_exec_fail2.cpp

@@ -26 +26 @@
 #include <cstddef> //Metrowerks linker needs at least one standard library
 #endif
 
+#if defined(__IBMCPP__)
+#pragma options check=divzero
+#endif
+
 
 int cpp_main( int, char *[] )  // note the name
 {

tools/build/v2/tools/python.jam

@@ -626 +626 @@
 
         case hpux : return  <library>rt ;
 
+        case aix : return  <library>pthread <library>dl ;
+
         case * : return  <library>pthread <library>dl <toolset>gcc:<library>util ;
     }
 }
@@ -926 +928 @@
     {
         alias python_for_extensions : python : $(target-requirements) ;
     }
+    # On AIX we need Python extensions and Boost.Python to import symbols
+    # from the Python interpreter. Dynamic libraries opened with dlopen()
+    # do not inherit the symbols from the Python interpreter.
+    else if $(target-os) = aix
+    {
+        alias python_for_extensions
+                     :
+                     : $(target-requirements)
+                     :
+                     : $(usage-requirements) <linkflags>-Wl,-bI:$(libraries[1])/python.exp
+                     ;
+    }
     else
     {
         alias python_for_extensions

tools/build/v2/tools/vacpp.jam

@@ -5 +5 @@
 # or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #
-# Boost.Build V2 toolset for the IBM VisualAge compiler
+# Boost.Build V2 toolset for the IBM XL C++ compiler
 #
 
 import toolset : flags ;
 import feature ;
 import common ;
 import generators ;
+import os ;
 
 feature.extend toolset : vacpp ;
 toolset.inherit vacpp : unix ;
@@ -19 +20 @@
 generators.override vacpp.searched-lib-generator : searched-lib-generator ;
 feature.subfeature toolset vacpp : version ;
 
-# Configures the vacpp toolset. 
+# Configure the vacpp toolset
 rule init ( version ? : command * : options * )
 {
 }
 
-
 # Declare generators
 generators.register-c-compiler vacpp.compile.c : C : OBJ : <toolset>vacpp ;
 generators.register-c-compiler vacpp.compile.c++ : CPP : OBJ : <toolset>vacpp ;
 
-# Declare flags.
+# Allow C++ style comments in C files
+flags vacpp CFLAGS : -qcpluscmt ;
+
+# Declare flags
 flags vacpp CFLAGS <optimization>off : -qNOOPTimize ;
 flags vacpp CFLAGS <optimization>speed : -O3 -qstrict ;
 flags vacpp CFLAGS <optimization>space : -O2 -qcompact ;
 
+# Discretionary inlining (not recommended)
 flags vacpp CFLAGS <inlining>off : -qnoinline ;
 flags vacpp CFLAGS <inlining>on : -qinline ;
-flags vacpp CFLAGS <inlining>full : -qinline ;
+#flags vacpp CFLAGS <inlining>full : -qinline ;
+flags vacpp CFLAGS <inlining>full : ;
 
+# Exception handling
 flags vacpp C++FLAGS <exception-handling>off : -qnoeh ;
 flags vacpp C++FLAGS <exception-handling>on : -qeh ;
 
+# Run-time Type Identification
 flags vacpp C++FLAGS <rtti>off : -qnortti ;
 flags vacpp C++FLAGS <rtti>on : -qrtti ;
 
-# flags vacpp LINKFLAGS <runtime-link>static : -llibstd_v2.a ;
-# flags vacpp LINKFLAGS <runtime-link>shared : -llibstd_v2.sl ;
-
-# We want the full path to the sources in the debug symbols because otherwise
-# the debugger won't find the sources when we use boost.build.
-flags vacpp CFLAGS <debug-symbols>on : -g ;
-flags vacpp LINKFLAGS <debug-symbols>on : -g ;
+# Enable 64-bit memory addressing model
+flags vacpp CFLAGS <address-model>64 : -q64 ;
+flags vacpp LINKFLAGS <address-model>64 : -q64 ;
+flags vacpp ARFLAGS <address-model>64 : -X 64 ;
+
+# Use absolute path when generating debug information
+flags vacpp CFLAGS <debug-symbols>on : -g -qfullpath ;
+flags vacpp LINKFLAGS <debug-symbols>on : -g -qfullpath ;
 flags vacpp LINKFLAGS <debug-symbols>off : -s ;
 
-# V2 does not have <shared-linkable>, not sure what this meant in V1.
-#flags vacpp CFLAGS <shared-linkable>true : +Z ;
+if [ os.name ] = AIX
+{
+    # Tell the linker to discard unneeded object files from archive libraries.
+    # Please note that the static constructors contained by the discarded object
+    # files will not be invoked.
+    flags vacpp.compile C++FLAGS : -qfuncsect ;
+    flags vacpp.link LINKFLAGS <link>static : -qtwolink ;
+
+    # Run-time linking
+    flags vacpp.link EXE-LINKFLAGS <link>shared : -brtl ;
+}
+else
+{
+    # Linux PPC
+    flags vacpp.compile CFLAGS <link>shared : -qpic ;
+}
 
+# Profiling
 flags vacpp CFLAGS <profiling>on : -pg ;
 flags vacpp LINKFLAGS <profiling>on : -pg ;
 
@@ -79 +102 @@
 flags vacpp VA_CXX_COMPILER <threading>single : xlC   ;
 flags vacpp VA_CXX_COMPILER <threading>multi : xlC_r ;
 
-ROOT = /usr/vacpp/bin ;
+
 actions vacpp.link bind NEEDLIBS
 {
-    $(ROOT)/$(VA_CXX_COMPILER) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
+    $(VA_CXX_COMPILER) $(EXE-LINKFLAGS) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
 }
 
 actions vacpp.link.dll bind NEEDLIBS
 {
-    xlC_r -qmkshrobj $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
+    xlC_r -G $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
 }
 
 actions vacpp.compile.c
-{    
-    $(ROOT)/$(VA_C_COMPILER) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+{
+    $(VA_C_COMPILER) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 actions vacpp.compile.c++
 {
-    $(ROOT)/$(VA_CXX_COMPILER) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(VA_CXX_COMPILER) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 actions updated together piecemeal vacpp.archive

tools/build/v2/util/os.jam

@@ -71 +71 @@
 
 .shared-library-path-variable-MACOSX = DYLD_LIBRARY_PATH ;
 
+.shared-library-path-variable-AIX = LIBPATH ;
+
 # Default constants
 .shared-library-path-variable = LD_LIBRARY_PATH ;
 .path-separator = ":" ;

tools/regression/compiler_status.cpp

@@ -576 +576 @@
         test_type_base.erase( trailer );
       }
     }
+    if ( test_type_base.size() > 4 )
+    {
+      const string::size_type trailer = test_type_base.size() - 4;
+      if ( test_type_base.substr( trailer ) == "_pyd" )
+      {
+        test_type_base.erase( trailer );
+      }
+    }
     const xml::element & test_type_element( find_element( db, test_type_base ) );
 
     pass = !test_type_element.name.empty()