From a209c6b6c510433ee1a695b53205c8f0775e7601 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 24 Dec 2021 14:05:08 +0100
Subject: [PATCH] Use non-hacky hidden shim symbols

---
 images/base-linux64/Dockerfile    | 5 ++---
 images/base-linux64/gen-implib.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index a3c6a4f..f8c39c7 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -33,12 +33,11 @@ RUN \
         -delete && \
     mkdir /opt/ffbuild
 
-RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib && \
-    sed -i '/^.*\.globl.*/a \ \ .hidden $sym' /opt/implib/arch/*/trampoline.S.tpl
-
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson
+
 ADD gen-implib.sh /usr/bin/gen-implib
+RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
 
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
     FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \
diff --git a/images/base-linux64/gen-implib.sh b/images/base-linux64/gen-implib.sh
index 41f8d86..fd1930f 100755
--- a/images/base-linux64/gen-implib.sh
+++ b/images/base-linux64/gen-implib.sh
@@ -13,5 +13,5 @@ cd "$TMPDIR"
 
 set -x
 python3 /opt/implib/implib-gen.py --target x86_64-linux-gnu --dlopen --lazy-load --verbose "$IN"
-${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -c *.tramp.S *.init.c
+${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c
 ${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o