Skip to content

Commit 3e8aa11

Browse files
committed
Revert "Update HP libunwind to v1.8.0 (#96969)"
This reverts commit 5bb5840.
1 parent b4aa81d commit 3e8aa11

File tree

342 files changed

+6685
-11312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+6685
-11312
lines changed
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
v1.8.0
2-
https://github.com/libunwind/libunwind/commit/2c2566c79c4f9cb505e6a23e4ab884d856ef88fe
1+
v1.7.0
2+
https://github.com/libunwind/libunwind/commit/688caaf6ef9853cc26ad8bd1706804d48a0df0bc
33

4-
Apply https://github.com/libunwind/libunwind/pull/700
5-
Apply https://github.com/libunwind/libunwind/pull/701
6-
Apply https://github.com/libunwind/libunwind/pull/703
7-
Apply https://github.com/libunwind/libunwind/pull/704
8-
Revert https://github.com/libunwind/libunwind/pull/503 # issue: https://github.com/libunwind/libunwind/issues/702
4+
Apply https://github.com/libunwind/libunwind/pull/457
5+
Apply https://github.com/libunwind/libunwind/pull/455
6+
Apply https://github.com/libunwind/libunwind/pull/460

src/native/external/libunwind.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ set(libunwind_la_SOURCES_generic
4545
mi/Gget_fpreg.c mi/Gset_fpreg.c
4646
mi/Gset_caching_policy.c
4747
mi/Gset_cache_size.c
48-
mi/Gaddress_validator.c
4948
)
5049

5150
set(libunwind_la_SOURCES_os_linux
@@ -82,8 +81,6 @@ if(CLR_CMAKE_TARGET_LINUX)
8281
set(libunwind_la_SOURCES_x86_64_os_local x86_64/Los-linux.c)
8382
set(libunwind_la_SOURCES_arm_os arm/Gos-linux.c)
8483
set(libunwind_la_SOURCES_arm_os_local arm/Los-linux.c)
85-
set(libunwind_la_SOURCES_aarch64_os aarch64/Gos-linux.c)
86-
set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-linux.c)
8784
list(APPEND libunwind_coredump_la_SOURCES coredump/_UCD_access_reg_linux.c)
8885
elseif(CLR_CMAKE_TARGET_FREEBSD)
8986
set(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_freebsd})
@@ -95,8 +92,6 @@ elseif(CLR_CMAKE_TARGET_FREEBSD)
9592
set(libunwind_la_SOURCES_x86_64_os_local x86_64/Los-freebsd.c)
9693
set(libunwind_la_SOURCES_arm_os arm/Gos-freebsd.c)
9794
set(libunwind_la_SOURCES_arm_os_local arm/Los-freebsd.c)
98-
set(libunwind_la_SOURCES_aarch64_os aarch64/Gos-freebsd.c)
99-
set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-freebsd.c)
10095
list(APPEND libunwind_coredump_la_SOURCES coredump/_UCD_access_reg_freebsd.c)
10196
elseif(CLR_CMAKE_HOST_SUNOS)
10297
set(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_solaris})
@@ -229,7 +224,6 @@ set(libunwind_la_SOURCES_aarch64_common
229224
# The list of files that go into libunwind:
230225
set(libunwind_la_SOURCES_aarch64
231226
${libunwind_la_SOURCES_aarch64_common}
232-
${libunwind_la_SOURCES_aarch64_os_local}
233227
${libunwind_la_SOURCES_local}
234228
aarch64/Lapply_reg_state.c aarch64/Lreg_states_iterate.c
235229
aarch64/Lcreate_addr_space.c aarch64/Lget_proc_info.c
@@ -240,10 +234,8 @@ set(libunwind_la_SOURCES_aarch64
240234
aarch64/getcontext.S
241235
)
242236

243-
# The list of files that go into libunwind-aarch64:
244237
set(libunwind_aarch64_la_SOURCES_aarch64
245238
${libunwind_la_SOURCES_aarch64_common}
246-
${libunwind_la_SOURCES_aarch64_os}
247239
${libunwind_la_SOURCES_generic}
248240
aarch64/Gapply_reg_state.c aarch64/Greg_states_iterate.c
249241
aarch64/Gcreate_addr_space.c aarch64/Gget_proc_info.c

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

Lines changed: 54 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: CI - Unix
22

3-
permissions:
4-
contents: read
5-
63
on:
74
pull_request:
85
paths:
@@ -19,128 +16,113 @@ on:
1916
- master
2017

2118
jobs:
22-
build-native:
23-
runs-on: ubuntu-22.04
24-
name: build-${{ matrix.toolchain.compiler }}-${{ matrix.target.arch }}${{ matrix.optimization.CFLAGS }}
25-
19+
build:
20+
runs-on: ubuntu-latest
21+
name: build-${{ join(matrix.*, ' ') }}
2622
strategy:
2723
fail-fast: false
2824
matrix:
29-
target:
30-
- { arch: i686, triple: i686-pc-linux-gnu, CFLAGS: -m32 }
31-
- { arch: x86_64, triple: x86_64-pc-linux-gnu, CFLAGS: }
32-
toolchain:
33-
- { compiler: gcc, CC: gcc-12, CXX: g++-12 }
34-
- { compiler: clang, CC: clang-13, CXX: clang++-13 }
35-
optimization:
36-
- { CFLAGS: -O0 }
37-
- { CFLAGS: -O3 }
25+
HOST:
26+
- x86_64-linux-gnu
27+
- x86-linux-gnu
28+
- arm-linux-gnueabihf
29+
- aarch64-linux-gnu
30+
- mipsel-linux-gnu
31+
- powerpc64-linux-gnu
32+
OPT:
33+
- O0
34+
- O3
3835
steps:
39-
- uses: actions/checkout@v3
40-
36+
- uses: actions/checkout@v2
4137
- name: Setup
42-
if: ${{ matrix.target.arch }} = 'i686'
4338
run: |
44-
sudo apt update
45-
sudo apt install -y g++-12-multilib
46-
39+
HOST=${{ matrix.HOST }}
40+
if [ $HOST = 'x86-linux-gnu' ]; then
41+
sudo apt-get update
42+
sudo apt-get install -yqq -o=Dpkg::Use-Pty=0 g++-multilib
43+
elif [ $HOST != 'x86_64-linux-gnu' ]; then
44+
sudo apt-get update
45+
sudo apt-get install -yqq -o=Dpkg::Use-Pty=0 g++-$HOST
46+
fi
4747
- name: Configure
4848
run: |
4949
set -x
50+
HOST=${{ matrix.HOST }}
51+
BUILD=x86_64-linux-gnu
52+
if [ $HOST = 'x86-linux-gnu' ]; then
53+
CFLAGS="-m32"
54+
CXXFLAGS="-m32"
55+
BUILD=x86-linux-gnu
56+
fi
57+
export CFLAGS="$CFLAGS -${{ matrix.OPT }}"
58+
export CXXFLAGS="$CXXFLAGS -${{ matrix.OPT}}"
5059
autoreconf -i
51-
./configure --build=x86_64-pc-linux-gnu --host=${{ matrix.target.triple }}
52-
env:
53-
CC: ${{ matrix.toolchain.CC }}
54-
CXX: ${{ matrix.toolchain.CXX }}
55-
CFLAGS: "${{ matrix.target.CFLAGS }} ${{ matrix.optimization.CFLAGS }} -Wall -Wextra"
56-
CXXFLAGS: "${{ matrix.target.CFLAGS }} ${{ matrix.optimization.CFLAGS }} -Wall -Wextra"
57-
LDFLAGS: ${{ matrix.target.CFLAGS }}
58-
59-
- name: Build
60-
run: |
60+
./configure --build=$BUILD --host=$HOST
6161
make -j8
62-
6362
- name: Test (native)
64-
if: ${{ success() }}
63+
if: ${{ success() && (matrix.HOST == 'x86_64-linux-gnu' || matrix.HOST == 'x86-linux-gnu') }}
6564
run: |
6665
set -x
6766
sudo bash -c 'echo core.%p.%p > /proc/sys/kernel/core_pattern'
6867
ulimit -c unlimited
69-
make check -j8
70-
68+
make check -j32
7169
- name: Show Logs
7270
if: ${{ failure() }}
7371
run: |
7472
cat tests/test-suite.log 2>/dev/null
7573
76-
build-cross:
77-
runs-on: ubuntu-22.04
78-
name: build-cross-${{ matrix.config.target }}
74+
build-cross-qemu:
75+
runs-on: ubuntu-latest
76+
name: build-cross-qemu-${{ matrix.config.target }}
7977

8078
strategy:
8179
fail-fast: false
8280
matrix:
8381
config:
84-
- {target: arm, host: arm-linux-gnueabi, qemu: arm, gccver: 12 }
85-
- {target: armhf, host: arm-linux-gnueabihf, qemu: arm, gccver: 12 }
86-
- {target: aarch64, host: aarch64-linux-gnu, qemu: aarch64, gccver: 12 }
87-
- {target: riscv64, host: riscv64-linux-gnu, qemu: riscv64, gccver: 12 }
88-
- {target: ppc, host: powerpc-linux-gnu, qemu: ppc, gccver: 12 }
89-
- {target: ppc64, host: powerpc64-linux-gnu, qemu: ppc64, gccver: 12 }
90-
- {target: ppc64le, host: powerpc64le-linux-gnu, qemu: ppc64le, gccver: 12 }
91-
- {target: s390x, host: s390x-linux-gnu, qemu: s390x, gccver: 12 }
92-
- {target: mips, host: mips-linux-gnu, qemu: mips, gccver: 10 }
93-
- {target: mips64, host: mips64-linux-gnuabi64, qemu: mips64, gccver: 10 }
94-
- {target: mipsel, host: mipsel-linux-gnu, qemu: mipsel, gccver: 10 }
95-
- {target: mips64el, host: mips64el-linux-gnuabi64, qemu: mips64el, gccver: 10 }
82+
- {target: arm, toolchain: g++-arm-linux-gnueabi, host: arm-linux-gnueabi, qemu: arm }
83+
- {target: armhf, toolchain: g++-arm-linux-gnueabihf, host: arm-linux-gnueabihf, qemu: arm }
84+
- {target: aarch64, toolchain: g++-aarch64-linux-gnu, host: aarch64-linux-gnu, qemu: aarch64 }
85+
- {target: riscv64, toolchain: g++-riscv64-linux-gnu, host: riscv64-linux-gnu, qemu: riscv64 }
86+
- {target: ppc, toolchain: g++-powerpc-linux-gnu, host: powerpc-linux-gnu, qemu: ppc }
87+
- {target: ppc64, toolchain: g++-powerpc64-linux-gnu, host: powerpc64-linux-gnu, qemu: ppc64 }
88+
- {target: ppc64le, toolchain: g++-powerpc64le-linux-gnu, host: powerpc64le-linux-gnu, qemu: ppc64le }
89+
- {target: s390x, toolchain: g++-s390x-linux-gnu, host: s390x-linux-gnu, qemu: s390x }
90+
- {target: mips, toolchain: g++-mips-linux-gnu, host: mips-linux-gnu, qemu: mips }
91+
- {target: mips64, toolchain: g++-mips64-linux-gnuabi64, host: mips64-linux-gnuabi64, qemu: mips64 }
92+
- {target: mipsel, toolchain: g++-mipsel-linux-gnu, host: mipsel-linux-gnu, qemu: mipsel }
93+
- {target: mips64el,toolchain: g++-mips64el-linux-gnuabi64, host: mips64el-linux-gnuabi64,qemu: mips64el }
9694

9795
steps:
98-
- uses: actions/checkout@v3
96+
- uses: actions/checkout@v2
9997
- name: Install QEMU
10098
# this ensure install latest qemu on ubuntu, apt get version is old
10199
env:
102100
QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu"
103-
QEMU_VER: "qemu-user-static_7\\.2.*_amd64.deb$"
101+
QEMU_VER: "qemu-user-static_4\\.2-.*_amd64.deb$"
104102
run: |
105103
DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1`
106104
wget $QEMU_SRC/$DEB
107105
sudo dpkg -i $DEB
108-
109-
- name: Install ${{ matrix.config.host }} Toolchain
106+
- name: Install ${{ matrix.config.toolchain }}
110107
run: |
111108
sudo apt update
112-
sudo apt install g++-${{ matrix.config.gccver }}-${{ matrix.config.host }} -y
113-
109+
sudo apt install ${{ matrix.config.toolchain }} -y
114110
- name: Configure with ${{ matrix.config.cc }}
115111
run: |
116112
set -x
117113
autoreconf -i
118114
BUILD=x86_64-linux-gnu
119-
./configure --build=$BUILD --host=${{ matrix.config.host }} --with-testdriver=$(pwd)/scripts/qemu-test-driver --enable-debug
120-
env:
121-
CC: ${{ matrix.config.host }}-gcc-${{ matrix.config.gccver }}
122-
CXX: ${{ matrix.config.host }}-g++-${{ matrix.config.gccver }}
123-
115+
./configure --build=$BUILD --host=${{ matrix.config.host }} --with-testdriver=$(pwd)/scripts/qemu-test-driver
124116
- name: Build
125117
run: |
126118
make -j8
127-
env:
128-
CFLAGS: "-Wall -Wextra"
129-
130-
- name: ABI Check
131-
run: |
132-
cd tests && ./run-check-namespace
133-
134119
- name: Test
135120
run: |
136121
set -x
137122
sudo bash -c 'echo core.%p.%p > /proc/sys/kernel/core_pattern'
138123
ulimit -c unlimited
139124
CROSS_LIB="/usr/${{ matrix.config.host }}"
140125
make -j8 check LOG_DRIVER_FLAGS="--qemu-arch ${{ matrix.config.qemu }}" LDFLAGS="-L$CROSS_LIB/lib -static" QEMU_LD_PREFIX="$CROSS_LIB"
141-
env:
142-
UNW_DEBUG_LEVEL: 4
143-
144126
- name: Show Logs
145127
if: ${{ failure() }}
146128
run: |

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: CI - Windows
22

3-
permissions:
4-
contents: read
5-
63
on:
74
pull_request:
85
paths:
@@ -30,7 +27,7 @@ jobs:
3027
- {toolchain: Visual Studio 17 2022, arch: x64, server: 2022, TARGET: aarch64-linux-gnu}
3128
- {toolchain: Visual Studio 17 2022, arch: x64, server: 2022, TARGET: x86_64-linux-gnu}
3229
steps:
33-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v2
3431
- name: Build
3532
shell: cmd
3633
env:

src/native/external/libunwind/.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/native/external/libunwind/.github/workflows/groom-issues.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/native/external/libunwind/.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Makefile.in
1515

1616
INSTALL
1717
aclocal.m4
18-
m4/
1918
autom4te.cache/
2019
aux
2120
config.log
@@ -78,12 +77,7 @@ tests/[GL]ia64-test-readonly
7877
tests/[GL]ia64-test-stack
7978
tests/ia64-test-dyn1
8079
tests/ia64-test-sig
81-
tests/ppc64-test-altivec
82-
tests/ppc64-test-plt
8380
tests/[GL]x64-test-dwarf-expressions
8481
tests/x64-unwind-badjmp-signal-frame
85-
tests/[GL]arm64-test-sve-signal
86-
tests/aarch64-test-plt
87-
tests/aarch64-test-frame-record
8882
tests/*.log
8983
tests/*.trs

src/native/external/libunwind/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_C_STANDARD 11)
66

77
set(PKG_MAJOR "1")
88
set(PKG_MINOR "6")
9-
set(PKG_EXTRA "-rc2")
9+
set(PKG_EXTRA "-rc1")
1010
set(PACKAGE_STRING "libunwind")
1111
set(PACKAGE_BUGREPORT "")
1212

src/native/external/libunwind/Makefile.am

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ endif BUILD_PTRACE
88
if BUILD_COREDUMP
99
include_HEADERS += include/libunwind-coredump.h
1010
endif BUILD_COREDUMP
11-
if BUILD_NTO
12-
include_HEADERS += include/libunwind-nto.h
13-
endif BUILD_NTO
11+
1412
if ARCH_AARCH64
1513
include_HEADERS += include/libunwind-aarch64.h
1614
endif
@@ -26,6 +24,9 @@ endif
2624
if ARCH_MIPS
2725
include_HEADERS += include/libunwind-mips.h
2826
endif
27+
if ARCH_TILEGX
28+
include_HEADERS += include/libunwind-tilegx.h
29+
endif
2930
if ARCH_X86
3031
include_HEADERS += include/libunwind-x86.h
3132
endif
@@ -84,6 +85,8 @@ noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \
8485
include/tdep-hppa/jmpbuf.h include/tdep-hppa/dwarf-config.h \
8586
include/tdep-mips/libunwind_i.h \
8687
include/tdep-mips/jmpbuf.h include/tdep-mips/dwarf-config.h \
88+
include/tdep-tilegx/libunwind_i.h \
89+
include/tdep-tilegx/jmpbuf.h include/tdep-tilegx/dwarf-config.h \
8790
include/tdep-x86/libunwind_i.h \
8891
include/tdep-x86/jmpbuf.h include/tdep-x86/dwarf-config.h \
8992
include/tdep-x86_64/libunwind_i.h \

0 commit comments

Comments
 (0)