[release/9.0-preview1] Revert "Update HP libunwind to v1.8.0"

src/native/external/libunwind-version.txt

@@ -1,8 +1,6 @@
-v1.8.0
-https://github.com/libunwind/libunwind/commit/2c2566c79c4f9cb505e6a23e4ab884d856ef88fe
+v1.7.0
+https://github.com/libunwind/libunwind/commit/688caaf6ef9853cc26ad8bd1706804d48a0df0bc
 
-Apply https://github.com/libunwind/libunwind/pull/700
-Apply https://github.com/libunwind/libunwind/pull/701
-Apply https://github.com/libunwind/libunwind/pull/703
-Apply https://github.com/libunwind/libunwind/pull/704
-Revert https://github.com/libunwind/libunwind/pull/503 # issue: https://github.com/libunwind/libunwind/issues/702
+Apply https://github.com/libunwind/libunwind/pull/457
+Apply https://github.com/libunwind/libunwind/pull/455
+Apply https://github.com/libunwind/libunwind/pull/460

src/native/external/libunwind.cmake

@@ -45,7 +45,6 @@ set(libunwind_la_SOURCES_generic
     mi/Gget_fpreg.c mi/Gset_fpreg.c
     mi/Gset_caching_policy.c
     mi/Gset_cache_size.c
-    mi/Gaddress_validator.c
 )
 
 set(libunwind_la_SOURCES_os_linux
@@ -82,8 +81,6 @@ if(CLR_CMAKE_TARGET_LINUX)
     set(libunwind_la_SOURCES_x86_64_os_local    x86_64/Los-linux.c)
     set(libunwind_la_SOURCES_arm_os             arm/Gos-linux.c)
     set(libunwind_la_SOURCES_arm_os_local       arm/Los-linux.c)
-    set(libunwind_la_SOURCES_aarch64_os         aarch64/Gos-linux.c)
-    set(libunwind_la_SOURCES_aarch64_os_local   aarch64/Los-linux.c)
     list(APPEND libunwind_coredump_la_SOURCES   coredump/_UCD_access_reg_linux.c)
 elseif(CLR_CMAKE_TARGET_FREEBSD)
     set(libunwind_la_SOURCES_os                 ${libunwind_la_SOURCES_os_freebsd})
@@ -95,8 +92,6 @@ elseif(CLR_CMAKE_TARGET_FREEBSD)
     set(libunwind_la_SOURCES_x86_64_os_local    x86_64/Los-freebsd.c)
     set(libunwind_la_SOURCES_arm_os             arm/Gos-freebsd.c)
     set(libunwind_la_SOURCES_arm_os_local       arm/Los-freebsd.c)
-    set(libunwind_la_SOURCES_aarch64_os         aarch64/Gos-freebsd.c)
-    set(libunwind_la_SOURCES_aarch64_os_local   aarch64/Los-freebsd.c)
     list(APPEND libunwind_coredump_la_SOURCES   coredump/_UCD_access_reg_freebsd.c)
 elseif(CLR_CMAKE_HOST_SUNOS)
     set(libunwind_la_SOURCES_os                 ${libunwind_la_SOURCES_os_solaris})
@@ -229,7 +224,6 @@ set(libunwind_la_SOURCES_aarch64_common
 # The list of files that go into libunwind:
 set(libunwind_la_SOURCES_aarch64
     ${libunwind_la_SOURCES_aarch64_common}
-    ${libunwind_la_SOURCES_aarch64_os_local}
     ${libunwind_la_SOURCES_local}
     aarch64/Lapply_reg_state.c aarch64/Lreg_states_iterate.c
     aarch64/Lcreate_addr_space.c aarch64/Lget_proc_info.c
@@ -240,10 +234,8 @@ set(libunwind_la_SOURCES_aarch64
     aarch64/getcontext.S
 )
 
-# The list of files that go into libunwind-aarch64:
 set(libunwind_aarch64_la_SOURCES_aarch64
     ${libunwind_la_SOURCES_aarch64_common}
-    ${libunwind_la_SOURCES_aarch64_os}
     ${libunwind_la_SOURCES_generic}
     aarch64/Gapply_reg_state.c aarch64/Greg_states_iterate.c
     aarch64/Gcreate_addr_space.c aarch64/Gget_proc_info.c

src/native/external/libunwind/.github/workflows/CI-unix.yml

@@ -1,8 +1,5 @@
 name: CI - Unix
 
-permissions:
-  contents: read
-
 on:
   pull_request:
     paths:
@@ -19,128 +16,113 @@ on:
       - master
 
 jobs:
-  build-native:
-    runs-on: ubuntu-22.04
-    name: build-${{ matrix.toolchain.compiler }}-${{ matrix.target.arch }}${{ matrix.optimization.CFLAGS }}
-
+  build:
+    runs-on: ubuntu-latest
+    name: build-${{ join(matrix.*, ' ') }}
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - { arch: i686,   triple: i686-pc-linux-gnu,   CFLAGS: -m32 }
-          - { arch: x86_64, triple: x86_64-pc-linux-gnu, CFLAGS:      }
-        toolchain:
-          - { compiler: gcc,   CC: gcc-12,   CXX: g++-12     }
-          - { compiler: clang, CC: clang-13, CXX: clang++-13 }
-        optimization:
-          - { CFLAGS: -O0 }
-          - { CFLAGS: -O3 }
+        HOST:
+          - x86_64-linux-gnu
+          - x86-linux-gnu
+          - arm-linux-gnueabihf
+          - aarch64-linux-gnu
+          - mipsel-linux-gnu
+          - powerpc64-linux-gnu
+        OPT:
+          - O0
+          - O3
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v2
       - name: Setup
-        if: ${{ matrix.target.arch }} = 'i686'
         run: |
-          sudo apt update
-          sudo apt install -y g++-12-multilib
-
+          HOST=${{ matrix.HOST }}
+          if [ $HOST = 'x86-linux-gnu' ]; then
+            sudo apt-get update
+            sudo apt-get install -yqq -o=Dpkg::Use-Pty=0 g++-multilib
+          elif [ $HOST != 'x86_64-linux-gnu' ]; then
+            sudo apt-get update
+            sudo apt-get install -yqq -o=Dpkg::Use-Pty=0 g++-$HOST
+          fi
       - name: Configure
         run: |
           set -x
+          HOST=${{ matrix.HOST }}
+          BUILD=x86_64-linux-gnu
+          if [ $HOST = 'x86-linux-gnu' ]; then
+            CFLAGS="-m32"
+            CXXFLAGS="-m32"
+            BUILD=x86-linux-gnu
+          fi
+          export CFLAGS="$CFLAGS -${{ matrix.OPT }}"
+          export CXXFLAGS="$CXXFLAGS -${{ matrix.OPT}}"
           autoreconf -i
-          ./configure --build=x86_64-pc-linux-gnu --host=${{ matrix.target.triple }}
-        env:
-          CC: ${{ matrix.toolchain.CC }}
-          CXX: ${{ matrix.toolchain.CXX }}
-          CFLAGS: "${{ matrix.target.CFLAGS }} ${{ matrix.optimization.CFLAGS }} -Wall -Wextra"
-          CXXFLAGS: "${{ matrix.target.CFLAGS }} ${{ matrix.optimization.CFLAGS }} -Wall -Wextra"
-          LDFLAGS: ${{ matrix.target.CFLAGS }}
-
-      - name: Build
-        run: |
+          ./configure --build=$BUILD --host=$HOST
           make -j8
-
       - name: Test (native)
-        if: ${{ success() }}
+        if: ${{ success() && (matrix.HOST == 'x86_64-linux-gnu' || matrix.HOST == 'x86-linux-gnu') }}
         run: |
           set -x
           sudo bash -c 'echo core.%p.%p > /proc/sys/kernel/core_pattern'
           ulimit -c unlimited
-          make check -j8
-
+          make check -j32
       - name: Show Logs
         if: ${{ failure() }}
         run: |
           cat tests/test-suite.log 2>/dev/null
 
-  build-cross:
-    runs-on: ubuntu-22.04
-    name: build-cross-${{ matrix.config.target }}
+  build-cross-qemu:
+    runs-on: ubuntu-latest
+    name: build-cross-qemu-${{ matrix.config.target }}
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {target: arm,      host: arm-linux-gnueabi,       qemu: arm,      gccver: 12 }
-          - {target: armhf,    host: arm-linux-gnueabihf,     qemu: arm,      gccver: 12 }
-          - {target: aarch64,  host: aarch64-linux-gnu,       qemu: aarch64,  gccver: 12 }
-          - {target: riscv64,  host: riscv64-linux-gnu,       qemu: riscv64,  gccver: 12 }
-          - {target: ppc,      host: powerpc-linux-gnu,       qemu: ppc,      gccver: 12 }
-          - {target: ppc64,    host: powerpc64-linux-gnu,     qemu: ppc64,    gccver: 12 }
-          - {target: ppc64le,  host: powerpc64le-linux-gnu,   qemu: ppc64le,  gccver: 12 }
-          - {target: s390x,    host: s390x-linux-gnu,         qemu: s390x,    gccver: 12 }
-          - {target: mips,     host: mips-linux-gnu,          qemu: mips,     gccver: 10 }
-          - {target: mips64,   host: mips64-linux-gnuabi64,   qemu: mips64,   gccver: 10 }
-          - {target: mipsel,   host: mipsel-linux-gnu,        qemu: mipsel,   gccver: 10 }
-          - {target: mips64el, host: mips64el-linux-gnuabi64, qemu: mips64el, gccver: 10 }
+          - {target: arm,     toolchain: g++-arm-linux-gnueabi,       host: arm-linux-gnueabi,      qemu: arm     }
+          - {target: armhf,   toolchain: g++-arm-linux-gnueabihf,     host: arm-linux-gnueabihf,    qemu: arm     }
+          - {target: aarch64, toolchain: g++-aarch64-linux-gnu,       host: aarch64-linux-gnu,      qemu: aarch64 }
+          - {target: riscv64, toolchain: g++-riscv64-linux-gnu,       host: riscv64-linux-gnu,      qemu: riscv64 }
+          - {target: ppc,     toolchain: g++-powerpc-linux-gnu,       host: powerpc-linux-gnu,      qemu: ppc     }
+          - {target: ppc64,   toolchain: g++-powerpc64-linux-gnu,     host: powerpc64-linux-gnu,    qemu: ppc64   }
+          - {target: ppc64le, toolchain: g++-powerpc64le-linux-gnu,   host: powerpc64le-linux-gnu,  qemu: ppc64le }
+          - {target: s390x,   toolchain: g++-s390x-linux-gnu,         host: s390x-linux-gnu,        qemu: s390x   }
+          - {target: mips,    toolchain: g++-mips-linux-gnu,          host: mips-linux-gnu,         qemu: mips     }
+          - {target: mips64,  toolchain: g++-mips64-linux-gnuabi64,   host: mips64-linux-gnuabi64,  qemu: mips64   }
+          - {target: mipsel,  toolchain: g++-mipsel-linux-gnu,        host: mipsel-linux-gnu,       qemu: mipsel   }
+          - {target: mips64el,toolchain: g++-mips64el-linux-gnuabi64, host: mips64el-linux-gnuabi64,qemu: mips64el }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Install QEMU
         # this ensure install latest qemu on ubuntu, apt get version is old
         env:
           QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu"
-          QEMU_VER: "qemu-user-static_7\\.2.*_amd64.deb$"
+          QEMU_VER: "qemu-user-static_4\\.2-.*_amd64.deb$"
         run: |
           DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1`
           wget $QEMU_SRC/$DEB
           sudo dpkg -i $DEB
-
-      - name: Install ${{ matrix.config.host }} Toolchain
+      - name: Install ${{ matrix.config.toolchain }}
         run: |
           sudo apt update
-          sudo apt install g++-${{ matrix.config.gccver }}-${{ matrix.config.host }} -y
-
+          sudo apt install ${{ matrix.config.toolchain }} -y
       - name: Configure with ${{ matrix.config.cc }}
         run: |
           set -x
           autoreconf -i
           BUILD=x86_64-linux-gnu
-          ./configure --build=$BUILD --host=${{ matrix.config.host }} --with-testdriver=$(pwd)/scripts/qemu-test-driver --enable-debug
-        env:
-          CC: ${{ matrix.config.host }}-gcc-${{ matrix.config.gccver }}
-          CXX: ${{ matrix.config.host }}-g++-${{ matrix.config.gccver }}
-
+          ./configure --build=$BUILD --host=${{ matrix.config.host }} --with-testdriver=$(pwd)/scripts/qemu-test-driver
       - name: Build
         run: |
           make -j8
-        env:
-          CFLAGS: "-Wall -Wextra"
-
-      - name: ABI Check
-        run: |
-            cd tests && ./run-check-namespace
-
       - name: Test
         run: |
           set -x
           sudo bash -c 'echo core.%p.%p > /proc/sys/kernel/core_pattern'
           ulimit -c unlimited
           CROSS_LIB="/usr/${{ matrix.config.host }}"
           make -j8 check LOG_DRIVER_FLAGS="--qemu-arch ${{ matrix.config.qemu }}" LDFLAGS="-L$CROSS_LIB/lib -static" QEMU_LD_PREFIX="$CROSS_LIB"
-        env:
-          UNW_DEBUG_LEVEL: 4
-
       - name: Show Logs
         if: ${{ failure() }}
         run: |

src/native/external/libunwind/.github/workflows/CI-win.yml

@@ -1,8 +1,5 @@
 name: CI - Windows
 
-permissions:
-  contents: read
-
 on:
   pull_request:
     paths:
@@ -30,7 +27,7 @@ jobs:
           - {toolchain: Visual Studio 17 2022, arch: x64, server: 2022, TARGET: aarch64-linux-gnu}
           - {toolchain: Visual Studio 17 2022, arch: x64, server: 2022, TARGET: x86_64-linux-gnu}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Build
         shell: cmd
         env:

src/native/external/libunwind/.gitignore

@@ -15,7 +15,6 @@ Makefile.in
 
 INSTALL
 aclocal.m4
-m4/
 autom4te.cache/
 aux
 config.log
@@ -78,12 +77,7 @@ tests/[GL]ia64-test-readonly
 tests/[GL]ia64-test-stack
 tests/ia64-test-dyn1
 tests/ia64-test-sig
-tests/ppc64-test-altivec
-tests/ppc64-test-plt
 tests/[GL]x64-test-dwarf-expressions
 tests/x64-unwind-badjmp-signal-frame
-tests/[GL]arm64-test-sve-signal
-tests/aarch64-test-plt
-tests/aarch64-test-frame-record
 tests/*.log
 tests/*.trs

src/native/external/libunwind/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_C_STANDARD 11)
 
 set(PKG_MAJOR "1")
 set(PKG_MINOR "6")
-set(PKG_EXTRA "-rc2")
+set(PKG_EXTRA "-rc1")
 set(PACKAGE_STRING "libunwind")
 set(PACKAGE_BUGREPORT "")
 

src/native/external/libunwind/Makefile.am

@@ -8,9 +8,7 @@ endif BUILD_PTRACE
 if BUILD_COREDUMP
 include_HEADERS += include/libunwind-coredump.h
 endif BUILD_COREDUMP
-if BUILD_NTO
-include_HEADERS += include/libunwind-nto.h
-endif BUILD_NTO
+
 if ARCH_AARCH64
 include_HEADERS += include/libunwind-aarch64.h
 endif
@@ -26,6 +24,9 @@ endif
 if ARCH_MIPS
 include_HEADERS += include/libunwind-mips.h
 endif
+if ARCH_TILEGX
+include_HEADERS += include/libunwind-tilegx.h
+endif
 if ARCH_X86
 include_HEADERS += include/libunwind-x86.h
 endif
@@ -84,6 +85,8 @@ noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
 	include/tdep-hppa/jmpbuf.h include/tdep-hppa/dwarf-config.h	\
 	include/tdep-mips/libunwind_i.h					\
 	include/tdep-mips/jmpbuf.h include/tdep-mips/dwarf-config.h	\
+	include/tdep-tilegx/libunwind_i.h				\
+	include/tdep-tilegx/jmpbuf.h include/tdep-tilegx/dwarf-config.h	\
 	include/tdep-x86/libunwind_i.h					\
 	include/tdep-x86/jmpbuf.h include/tdep-x86/dwarf-config.h	\
 	include/tdep-x86_64/libunwind_i.h				\