Push some changes from last week

Author: NWilson

.github/workflows/dev.yml

@@ -397,16 +397,17 @@ jobs:
           githubToken: ${{ github.token }}
 
           env: | # YAML, but pipe character is necessary
-            CFLAGS_GCC_STYLE: ${{ env.CFLAGS_GCC_STYLE }}
+            # -Wmaybe-uninitialized is spammy. It's not a useful warning for
+            # these multiarch builds.
+            CFLAGS_GCC_STYLE: ${{ env.CFLAGS_GCC_STYLE }} -Wno-maybe-uninitialized
 
           install: |
             apt-get -qq update
             apt-get -qq install -y gcc cmake ninja-build zlib1g-dev libbz2-dev
 
           run: |
             set -e
-            # TODO: Set -DCMAKE_COMPILE_WARNING_AS_ERROR=ON (there's currently a build failure on S390x)
-            cmake -G Ninja -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DPCRE2_DEBUG=ON -DCMAKE_C_FLAGS="$CFLAGS_GCC_STYLE" -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -B build
+            cmake -G Ninja -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DPCRE2_DEBUG=ON -DCMAKE_C_FLAGS="$CFLAGS_GCC_STYLE" -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -B build
             ninja -C build
             (cd build && ctest -j3 --output-on-failure)
 

CMakeLists.txt

@@ -204,6 +204,12 @@ check_c_source_compiles(
   HAVE_VISIBILITY
 )
 
+if(HAVE_VISIBILITY)
+  set(PCRE2_EXPORT [=[__attribute__ ((visibility ("default")))]=])
+else()
+  set(PCRE2_EXPORT)
+endif()
+
 set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
 
 check_c_source_compiles("int main(void) { __assume(1); return 0; }" HAVE_BUILTIN_ASSUME)
@@ -221,11 +227,33 @@ check_c_source_compiles(
   HAVE_BUILTIN_UNREACHABLE
 )
 
-if(HAVE_VISIBILITY)
-  set(PCRE2_EXPORT [=[__attribute__ ((visibility ("default")))]=])
-else()
-  set(PCRE2_EXPORT)
+# Detect support for linker scripts.
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym "PCRE2_10.00 { global: main; };")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym "PCRE2_10.00 { global: main; };  {")
+pcre2_check_linker_flag(C -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym HAVE_VSCRIPT_GNU)
+pcre2_check_linker_flag(C -Wl,-M,${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym HAVE_VSCRIPT_SUN)
+if(HAVE_VSCRIPT_GNU)
+  set(VSCRIPT_FLAG --version-script)
+  set(HAVE_VSCRIPT TRUE)
+elseif(HAVE_VSCRIPT_SUN)
+  set(VSCRIPT_FLAG -M)
+  set(HAVE_VSCRIPT TRUE)
 endif()
+if(HAVE_VSCRIPT)
+  # Perform the same logic as ax_check_vscript.m4, to test whether the linker
+  # silently ignores (and overwrites) linker scripts it doesn't understand.
+  pcre2_check_linker_flag(
+    C
+    -Wl,${VSCRIPT_FLAG},${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym
+    HAVE_VSCRIPT_BROKEN
+  )
+  if(HAVE_VSCRIPT_BROKEN)
+    set(HAVE_VSCRIPT FALSE)
+  endif()
+endif()
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym)
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym)
 
 # Check whether Intel CET is enabled, and if so, adjust compiler flags. This
 # code was written by PH, trying to imitate the logic from the autotools
@@ -397,6 +425,10 @@ if(MSVC)
   option(INSTALL_MSVC_PDB "ON=Install .pdb files built by MSVC, if generated" OFF)
 endif()
 
+if(HAVE_VSCRIPT)
+  option(PCRE2_SYMVERS "Enable library symbol versioning" ON)
+endif()
+
 # bzip2 lib
 if(BZIP2_FOUND)
   option(PCRE2_SUPPORT_LIBBZ2 "Enable support for linking pcre2grep with libbz2." ON)
@@ -630,34 +662,6 @@ if(EBCDIC)
   endif()
 endif()
 
-# Detect support for linker scripts.
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym "PCRE2_10.00 { global: main; };")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym "PCRE2_10.00 { global: main; };  {")
-pcre2_check_linker_flag(C -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym HAVE_VSCRIPT_GNU)
-pcre2_check_linker_flag(C -Wl,-M,${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym HAVE_VSCRIPT_SUN)
-if(HAVE_VSCRIPT_GNU)
-  set(VSCRIPT_FLAG --version-script)
-  set(HAVE_VSCRIPT TRUE)
-elseif(HAVE_VSCRIPT_SUN)
-  set(VSCRIPT_FLAG -M)
-  set(HAVE_VSCRIPT TRUE)
-endif()
-if(HAVE_VSCRIPT)
-  # Perform the same logic as ax_check_vscript.m4, to test whether the linker
-  # silently ignores (and overwrites) linker scripts it doesn't understand.
-  pcre2_check_linker_flag(
-    C
-    -Wl,${VSCRIPT_FLAG},${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym
-    HAVE_VSCRIPT_BROKEN
-  )
-  if(HAVE_VSCRIPT_BROKEN)
-    set(HAVE_VSCRIPT FALSE)
-  endif()
-endif()
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file.sym)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test-map-file-broken.sym)
-
 # Output files
 
 configure_file(src/config-cmake.h.in ${PROJECT_BINARY_DIR}/config.h @ONLY)
@@ -927,7 +931,7 @@ if(PCRE2_BUILD_PCRE2_8)
     if(REQUIRE_PTHREAD)
       target_link_libraries(pcre2-8-shared Threads::Threads)
     endif()
-    if(HAVE_VSCRIPT)
+    if(HAVE_VSCRIPT AND PCRE2_SYMVERS)
       target_link_options(pcre2-8-shared PRIVATE -Wl,${VSCRIPT_FLAG},${PROJECT_SOURCE_DIR}/src/libpcre2-8.sym)
       set_target_properties(pcre2-8-shared PROPERTIES LINK_DEPENDS ${PROJECT_SOURCE_DIR}/src/libpcre2-8.sym)
     endif()
@@ -947,7 +951,7 @@ if(PCRE2_BUILD_PCRE2_8)
         SOVERSION ${LIBPCRE2_POSIX_SOVERSION}
         OUTPUT_NAME pcre2-posix
     )
-    if(HAVE_VSCRIPT)
+    if(HAVE_VSCRIPT AND PCRE2_SYMVERS)
       target_link_options(pcre2-posix-shared PRIVATE -Wl,${VSCRIPT_FLAG},${PROJECT_SOURCE_DIR}/src/libpcre2-posix.sym)
       set_target_properties(pcre2-posix-shared PROPERTIES LINK_DEPENDS ${PROJECT_SOURCE_DIR}/src/libpcre2-posix.sym)
     endif()
@@ -1024,7 +1028,7 @@ if(PCRE2_BUILD_PCRE2_16)
     if(REQUIRE_PTHREAD)
       target_link_libraries(pcre2-16-shared Threads::Threads)
     endif()
-    if(HAVE_VSCRIPT)
+    if(HAVE_VSCRIPT AND PCRE2_SYMVERS)
       target_link_options(pcre2-16-shared PRIVATE -Wl,${VSCRIPT_FLAG},${PROJECT_SOURCE_DIR}/src/libpcre2-16.sym)
       set_target_properties(pcre2-16-shared PROPERTIES LINK_DEPENDS ${PROJECT_SOURCE_DIR}/src/libpcre2-16.sym)
     endif()
@@ -1096,7 +1100,7 @@ if(PCRE2_BUILD_PCRE2_32)
     if(REQUIRE_PTHREAD)
       target_link_libraries(pcre2-32-shared Threads::Threads)
     endif()
-    if(HAVE_VSCRIPT)
+    if(HAVE_VSCRIPT AND PCRE2_SYMVERS)
       target_link_options(pcre2-32-shared PRIVATE -Wl,${VSCRIPT_FLAG},${PROJECT_SOURCE_DIR}/src/libpcre2-32.sym)
       set_target_properties(pcre2-32-shared PROPERTIES LINK_DEPENDS ${PROJECT_SOURCE_DIR}/src/libpcre2-32.sym)
     endif()
@@ -1433,9 +1437,9 @@ if(PCRE2_SHOW_REPORT)
   else()
     message(STATUS "  Build type ........................ : ${CMAKE_BUILD_TYPE}")
   endif()
-  message(STATUS "  Build 8 bit PCRE2 library ......... : ${PCRE2_BUILD_PCRE2_8}")
-  message(STATUS "  Build 16 bit PCRE2 library ........ : ${PCRE2_BUILD_PCRE2_16}")
-  message(STATUS "  Build 32 bit PCRE2 library ........ : ${PCRE2_BUILD_PCRE2_32}")
+  message(STATUS "  Build 8 bit pcre2 library ......... : ${PCRE2_BUILD_PCRE2_8}")
+  message(STATUS "  Build 16 bit pcre2 library ........ : ${PCRE2_BUILD_PCRE2_16}")
+  message(STATUS "  Build 32 bit pcre2 library ........ : ${PCRE2_BUILD_PCRE2_32}")
   message(STATUS "  Include debugging code ............ : ${PCRE2_DEBUG}")
   message(STATUS "  Enable JIT compiling support ...... : ${PCRE2_SUPPORT_JIT}")
   message(STATUS "  Use SELinux allocator in JIT ...... : ${PCRE2_SUPPORT_JIT_SEALLOC}")
@@ -1458,18 +1462,24 @@ if(PCRE2_SHOW_REPORT)
 
   message(STATUS "  Internal link size ................ : ${PCRE2_LINK_SIZE}")
   message(STATUS "  Maximum variable lookbehind ....... : ${PCRE2_MAX_VARLOOKBEHIND}")
-  message(STATUS "  Parentheses nest limit ............ : ${PCRE2_PARENS_NEST_LIMIT}")
+  message(STATUS "  Nested parentheses limit .......... : ${PCRE2_PARENS_NEST_LIMIT}")
   message(STATUS "  Heap limit ........................ : ${PCRE2_HEAP_LIMIT}")
   message(STATUS "  Match limit ....................... : ${PCRE2_MATCH_LIMIT}")
   message(STATUS "  Match depth limit ................. : ${PCRE2_MATCH_LIMIT_DEPTH}")
   message(STATUS "  Build shared libs ................. : ${BUILD_SHARED_LIBS}")
+  if(NOT HAVE_VSCRIPT)
+    message(STATUS "      with symbol versioning ........ : n/a")
+  else()
+    message(STATUS "      with symbol versioning ........ : ${PCRE2_SYMVERS}")
+  endif()
   message(STATUS "  Build static libs ................. : ${BUILD_STATIC_LIBS}")
-  message(STATUS "     with PIC enabled ............... : ${PCRE2_STATIC_PIC}")
+  message(STATUS "      with PIC enabled .............. : ${PCRE2_STATIC_PIC}")
   message(STATUS "  Build pcre2grep ................... : ${PCRE2_BUILD_PCRE2GREP}")
   message(STATUS "  Enable JIT in pcre2grep ........... : ${PCRE2GREP_SUPPORT_JIT}")
   message(STATUS "  Enable callouts in pcre2grep ...... : ${PCRE2GREP_SUPPORT_CALLOUT}")
   message(STATUS "  Enable callout fork in pcre2grep .. : ${PCRE2GREP_SUPPORT_CALLOUT_FORK}")
-  message(STATUS "  Buffer size for pcre2grep ......... : ${PCRE2GREP_BUFSIZE}")
+  message(STATUS "  Initial buffer size for pcre2grep . : ${PCRE2GREP_BUFSIZE}")
+  message(STATUS "  Maximum buffer size for pcre2grep . : ${PCRE2GREP_MAX_BUFSIZE}")
   message(STATUS "  Build tests (implies pcre2test .... : ${PCRE2_BUILD_TESTS}")
   message(STATUS "               and pcre2grep)")
   if(ZLIB_FOUND)
@@ -1492,7 +1502,7 @@ if(PCRE2_SHOW_REPORT)
   else()
     message(STATUS "  Link pcre2test with libreadline ... : Library not found")
   endif()
-  message(STATUS "  Support Valgrind .................. : ${PCRE2_SUPPORT_VALGRIND}")
+  message(STATUS "  Enable Valgrind support ........... : ${PCRE2_SUPPORT_VALGRIND}")
   if(PCRE2_DISABLE_PERCENT_ZT)
     message(STATUS "  Use %zu and %td ................... : OFF")
   else()

configure.ac

@@ -1233,6 +1233,13 @@ elif test "$enable_ebcdic" = "yes"; then
   ebcdic_nl_code=0x15
 fi
 
+with_symbol_versioning=n/a
+if test x$want_symvers != xyes; then
+  with_symbol_versioning=no
+elif test x$ax_check_vscript_flag != x; then
+  with_symbol_versioning=yes
+fi
+
 cat <<EOF
 
 $PACKAGE-$VERSION configuration summary:
@@ -1267,8 +1274,9 @@ $PACKAGE-$VERSION configuration summary:
     Match limit ........................ : ${with_match_limit}
     Match depth limit .................. : ${with_match_limit_depth}
     Build shared libs .................. : ${enable_shared}
+        with symbol versioning ......... : ${with_symbol_versioning}
     Build static libs .................. : ${enable_static}
-    Use JIT in pcre2grep ............... : ${enable_pcre2grep_jit}
+    Enable JIT in pcre2grep ............ : ${enable_pcre2grep_jit}
     Enable callouts in pcre2grep ....... : ${enable_pcre2grep_callout}
     Enable fork in pcre2grep callouts .. : ${enable_pcre2grep_callout_fork}
     Initial buffer size for pcre2grep .. : ${with_pcre2grep_bufsize}
@@ -1277,7 +1285,7 @@ $PACKAGE-$VERSION configuration summary:
     Link pcre2grep with libbz2 ......... : ${enable_pcre2grep_libbz2}
     Link pcre2test with libedit ........ : ${enable_pcre2test_libedit}
     Link pcre2test with libreadline .... : ${enable_pcre2test_libreadline}
-    Valgrind support ................... : ${enable_valgrind}
+    Enable Valgrind support ............ : ${enable_valgrind}
     Code coverage ...................... : ${enable_coverage}
     Fuzzer support ..................... : ${enable_fuzz_support}
     Differential fuzzer support ........ : ${enable_diff_fuzz_support}

maint/RunManifestTest

@@ -9,7 +9,7 @@ LANG=C # Ensure stable ordering of `sort` output
 export LANG
 
 if [ "$1" = "" -o "$2" = "" ] ; then
-    echo "Usage: $0 <dir> <manifest name>" >&2
+  echo "Usage: $0 <dir> <manifest name>" >&2
   exit 1
 fi
 
@@ -32,11 +32,11 @@ find "$input_dir" -print | \
   > "$base"
 
 if ! diff -u "$expected_manifest" "$base"; then
-  echo "Installed files differ from expected" >&2
+  echo "Installed files differ from expected"
 
-  echo "===Actual===" >&2
-  cat "$base" >&2
-  echo "===End===" >&2
+  echo "===Actual==="
+  cat "$base"
+  echo "===End==="
 
   exit 1
 fi

maint/RunSymbolTest

@@ -8,7 +8,7 @@ LANG=C # Ensure stable ordering of `sort` output
 export LANG
 
 if [ "$1" = "" -o "$2" = "" ] ; then
-    echo "Usage: $0 <so_dir> <manifest_dir>" >&2
+  echo "Usage: $0 <so_dir> <manifest_dir>" >&2
   exit 1
 fi
 
@@ -26,12 +26,19 @@ if [ -f /usr/bin/ggrep ] ; then
 fi
 
 nm="nm -B -D"
+if [ "`uname -s`" = "Linux" ]; then
+  nm="$nm --with-symbol-versions"
 if [ "`uname -s`" = "SunOS" ]; then
   nm="nm -p -h -D -g"
 elif [ "`uname -s`" = "Darwin" ]; then
   nm="nm -B -g"
 fi
 
+supports_versions=1
+if [ "`uname -s`" = "Darwin" ]; then
+  supports_versions=0
+fi
+
 so_ext=so
 so_mangling() { cat; }
 if [ "`uname -s`" = "Darwin" ]; then
@@ -50,23 +57,31 @@ for so_name in "libpcre2-8" "libpcre2-16" "libpcre2-32" "libpcre2-posix"; do
   $nm "$so_file" | \
     $sed -E -e 's/^[0-9a-fA-F]* *//g' | \
     $grep -E -v '^[Uw] ' | \
+    $grep -E -v '^A PCRE2_' | \
     $grep -E -v ' (_init|_fini)$' | \
     $grep -E -v ' (_end|_DYNAMIC|_GLOBAL_OFFSET_TABLE_|_PROCEDURE_LINKAGE_TABLE_|_edata|_etext)$' | \
     so_mangling | \
     sort \
-    > "$base"
+    > "$base.actual"
+
+  if [ $supports_versions -eq 0 ]; then
+    $sed -E -e 's/@.*$//' "$expected_file" \
+      > "$base.expected"
+  else
+    cp "$expected_file" "$base.expected"
+  fi
 
-  if ! diff -u "$expected_file" "$base"; then
-    echo "Shared object contents for $so_file differ from expected" >&2
+  if ! diff -u "$base.expected" "$base.actual"; then
+    echo "Shared object contents for $so_file differ from expected"
 
-    echo "===Actual===" >&2
-    cat "$base" >&2
-    echo "===End===" >&2
+    echo "===Actual==="
+    cat "$base.actual"
+    echo "===End==="
 
     exit 1
   fi
 
   echo "Shared object contents for $so_file match expected"
-  rm -f "$base"
+  rm -f "$base.expected" "$base.actual"
 
 done