Skip to content

Commit 34eddd0

Browse files
liblol: add a dummy ld-linux-loongarch-lp64d.so.1
to prevent new world ld.so from loading when an old world executable loads a new world lib which then requiring the new world ld.so, since all symbols has been provided by our ld.so.1 in liblol. This fixes tencent meeting, which loads the new world libstdc++ in the system, which requires the new world ld.so.
1 parent 14c2359 commit 34eddd0

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

autobuild/build

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,21 @@ EOF
121121
"$i"
122122
done
123123

124+
abinfo "Generating a dummy ld-linux-loongarch-lp64d.so.1 ..."
125+
126+
gcc -shared \
127+
-x c /dev/null \
128+
-o ld-linux-loongarch-lp64d.so.1 \
129+
-Wl,--version-script -Wl,ld.map \
130+
-nostdlib
131+
124132
abinfo "Installing ..."
125133

126134
mkdir -pv "$PKGDIR$LOLPREFIX/lib/$OWTARGET/"
127-
for i in "libc.so.6" "nptl/libpthread.so.0" "${libs[@]}"; do
135+
for i in "libc.so.6" "nptl/libpthread.so.0" \
136+
"ld-linux-loongarch-lp64d.so.1" \
137+
"${libs[@]}"; \
138+
do
128139
install -Dvm644 "$i" \
129140
-t "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/"
130141
done

spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# AUTOGENERATED FILE from spec.main using genspec
2-
VER=0.1.1
2+
VER=0.1.2
3+
REL=0~pre1
34
_mirror="http://pkg.loongnix.cn/loongnix"
45

56
### For pkgs from outside loongnix repo

spec.main

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
VER=0.1.1
1+
VER=0.1.2
2+
REL=0~pre1
23
_mirror="http://pkg.loongnix.cn/loongnix"
34

45
### For pkgs from outside loongnix repo

0 commit comments

Comments
 (0)