From 1059f9a96da377af771fe643abc1d060db6d64bb Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 2 Jul 2019 18:20:41 -0400 Subject: jsoncpp: Fix compilation on HP-UX 11.31 ia64 with GCC 4.9.3 In particular, fix the `isfinite` definition. --- Utilities/cmjsoncpp/src/lib_json/json_writer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp index 6e6e57e..fc86505 100644 --- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp +++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp @@ -30,7 +30,7 @@ #define isfinite finite #endif #elif defined(__hpux) -#if !defined(isfinite) +#if !defined(isfinite) && !defined(__GNUC__) #if defined(__ia64) && !defined(finite) #define isfinite(x) ((sizeof(x) == sizeof(float) ? \ _Isfinitef(x) : _IsFinite(x))) @@ -86,10 +86,11 @@ // HP-UX #if defined(__hpux) # if !defined(isfinite) -# if defined(__ia64) && !defined(finite) +# if defined(__ia64) && !defined(finite) && !defined(__GNUC__) # define isfinite(x) ((sizeof(x) == sizeof(float) ? \ _Isfinitef(x) : _Isfinite(x))) # else +# include # define isfinite finite # endif # endif -- cgit v0.12 From 5ffb2dbff65bdd5db713ba0c177cecc122cac0d8 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 2 Jul 2019 18:20:41 -0400 Subject: libuv: Add partial port to HP-UX Port enough of libuv to HP-UX 11.31 ia64 with GCC 4.9.3 to work for CMake. --- Utilities/cmlibuv/CMakeLists.txt | 17 +++++++++++++++++ Utilities/cmlibuv/include/uv/unix.h | 2 ++ Utilities/cmlibuv/src/unix/core.c | 2 +- Utilities/cmlibuv/src/unix/fs.c | 2 +- Utilities/cmlibuv/src/unix/hpux.c | 30 ++++++++++++++++++++++++++++++ Utilities/cmlibuv/src/unix/posix-hrtime.c | 14 ++++++++++++++ Utilities/cmlibuv/src/unix/thread.c | 2 +- Utilities/cmlibuv/src/unix/tty.c | 2 +- bootstrap | 3 +++ 9 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 Utilities/cmlibuv/src/unix/hpux.c diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt index 2e781f1..fe2ef75 100644 --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt @@ -300,6 +300,23 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") ) endif() +if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX") + list(APPEND uv_libraries + rt + ) + list(APPEND uv_headers + include/uv/posix.h + ) + list(APPEND uv_defines + _XOPEN_SOURCE_EXTENDED + ) + list(APPEND uv_sources + src/unix/hpux.c + src/unix/no-fsevents.c + src/unix/posix-poll.c + ) +endif() + include_directories( ${uv_includes} ${KWSYS_HEADER_ROOT} diff --git a/Utilities/cmlibuv/include/uv/unix.h b/Utilities/cmlibuv/include/uv/unix.h index 011abcf..4e26108 100644 --- a/Utilities/cmlibuv/include/uv/unix.h +++ b/Utilities/cmlibuv/include/uv/unix.h @@ -55,6 +55,8 @@ # include "aix.h" #elif defined(__sun) # include "sunos.h" +#elif defined(__hpux) +# include "posix.h" #elif defined(__APPLE__) # include "darwin.h" #elif defined(__DragonFly__) || \ diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c index 93df7af..cf7dea0 100644 --- a/Utilities/cmlibuv/src/unix/core.c +++ b/Utilities/cmlibuv/src/unix/core.c @@ -587,7 +587,7 @@ int uv__nonblock_ioctl(int fd, int set) { } -#if !defined(__CYGWIN__) && !defined(__MSYS__) && !defined(__HAIKU__) +#if !defined(__hpux) && !defined(__CYGWIN__) && !defined(__MSYS__) && !defined(__HAIKU__) int uv__cloexec_ioctl(int fd, int set) { int r; diff --git a/Utilities/cmlibuv/src/unix/fs.c b/Utilities/cmlibuv/src/unix/fs.c index 3023b1e..5fb34f1b 100644 --- a/Utilities/cmlibuv/src/unix/fs.c +++ b/Utilities/cmlibuv/src/unix/fs.c @@ -234,7 +234,7 @@ static ssize_t uv__fs_futime(uv_fs_t* req) { #endif } -#if defined(__sun) && (_XOPEN_SOURCE < 600 || defined(CMAKE_BOOTSTRAP)) +#if (defined(__sun) || defined(__hpux)) && (_XOPEN_SOURCE < 600 || defined(CMAKE_BOOTSTRAP)) static char* uv__mkdtemp(char *template) { if (!mktemp(template) || mkdir(template, 0700)) diff --git a/Utilities/cmlibuv/src/unix/hpux.c b/Utilities/cmlibuv/src/unix/hpux.c new file mode 100644 index 0000000..4d3f628 --- /dev/null +++ b/Utilities/cmlibuv/src/unix/hpux.c @@ -0,0 +1,30 @@ +/* Copyright libuv project contributors. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "uv.h" +#include "internal.h" + +#include +#include + +uint64_t uv__hrtime(uv_clocktype_t type) { + return (uint64_t) gethrtime(); +} diff --git a/Utilities/cmlibuv/src/unix/posix-hrtime.c b/Utilities/cmlibuv/src/unix/posix-hrtime.c index a264250..870b45c 100644 --- a/Utilities/cmlibuv/src/unix/posix-hrtime.c +++ b/Utilities/cmlibuv/src/unix/posix-hrtime.c @@ -43,6 +43,20 @@ uint64_t uv__hrtime(uv_clocktype_t type) { return mach_absolute_time() * info.numer / info.denom; } +#elif defined(__hpux) +/* Special case for CMake bootstrap: no CLOCK_MONOTONIC on HP-UX */ + +#ifndef CMAKE_BOOTSTRAP +#error "This code path meant only for use during CMake bootstrap." +#endif + +#include +#include + +uint64_t uv__hrtime(uv_clocktype_t type) { + return (uint64_t) gethrtime(); +} + #else #include diff --git a/Utilities/cmlibuv/src/unix/thread.c b/Utilities/cmlibuv/src/unix/thread.c index cd0b7aa..0453221 100644 --- a/Utilities/cmlibuv/src/unix/thread.c +++ b/Utilities/cmlibuv/src/unix/thread.c @@ -700,7 +700,7 @@ int uv_cond_init(uv_cond_t* cond) { if (err) return UV__ERR(err); -#if !(defined(__ANDROID_API__) && __ANDROID_API__ < 21) +#if !(defined(__ANDROID_API__) && __ANDROID_API__ < 21) && !defined(__hpux) err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); if (err) goto error2; diff --git a/Utilities/cmlibuv/src/unix/tty.c b/Utilities/cmlibuv/src/unix/tty.c index b8bc283..db479d6 100644 --- a/Utilities/cmlibuv/src/unix/tty.c +++ b/Utilities/cmlibuv/src/unix/tty.c @@ -200,7 +200,7 @@ skip: static void uv__tty_make_raw(struct termios* tio) { assert(tio != NULL); -#if defined __sun || defined __MVS__ +#if defined __sun || defined __MVS__ || defined __hpux /* * This implementation of cfmakeraw for Solaris and derivatives is taken from * http://www.perkin.org.uk/posts/solaris-portability-cfmakeraw.html. diff --git a/bootstrap b/bootstrap index ca5441f..ded4637 100755 --- a/bootstrap +++ b/bootstrap @@ -1435,6 +1435,9 @@ else *Darwin*) uv_c_flags="${uv_c_flags} -D_DARWIN_USE_64_BIT_INODE=1 -D_DARWIN_UNLIMITED_SELECT=1" ;; + *HP-UX*) + uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE_EXTENDED" + ;; *Linux*) uv_c_flags="${uv_c_flags} -D_GNU_SOURCE" libs="${libs} -ldl -lrt" -- cgit v0.12 From ba315f2035bc048068b36ae22cc3e2c4bbc19d21 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Sep 2019 10:15:23 -0400 Subject: bootstrap: Require GCC 4.9 or higher on HP-UX Revise for future removal of the early rejection checks on HP-UX. Our code may now work with GCC 4.9 on HP-UX when manually using `env CXXFLAGS=-D_GLIBCXX_USE_C99` to make the C++11 `std::to_string` available on this platform. However, without nightly testing we cannot officially enable support for the platform. Issue: #17137 Co-Author: Earle Lowe --- bootstrap | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bootstrap b/bootstrap index ded4637..4f387bc 100755 --- a/bootstrap +++ b/bootstrap @@ -1059,6 +1059,10 @@ echo ' #error "On Solaris we need C99." #endif +#if defined(__hpux) && !(defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 409) +#error "On HP-UX we need GCC 4.9 or higher." +#endif + #include int main(int argc, char* argv[]) @@ -1127,6 +1131,10 @@ echo ' #error "SunPro <= 5.13 mode not supported due to bug in move semantics." #endif +#if defined(__hpux) && !(defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 409) +#error "On HP-UX we need GCC 4.9 or higher." +#endif + #if __cplusplus > 201103L #include int check_cxx14() -- cgit v0.12