AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

objc_namespace: Add support for universal binaries

Browse Source 
Pick-to: 6.2 6.3 5.15
Change-Id: If6a15c1ec27fe0e1a42764fbcd194d7806aecf0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-04-12 18:31:47 +02:00
parent e6e443e0bb
commit bb3c80e051
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
mkspecs/features/data/mac/objc_namespace.sh
View File

@ -100,11 +100,13 @@ sanitize_address() {
echo "0x$address" echo "0x$address"
} }
arch_offset=0
read_binary() { read_binary() {
local address=$1 local address=$1
local length=$2 local length=$2
dd if="$target" bs=1 iseek=$address count=$length 2>|/dev/null seek=$(($address + $arch_offset))
dd if="$target" bs=1 iseek=$seek count=$length 2>|/dev/null
} }
read_32bit_value() { read_32bit_value() {
@ -112,21 +114,16 @@ read_32bit_value() {
read_binary $address 4 | xxd -p | dd conv=swab 2>/dev/null | rev read_binary $address 4 | xxd -p | dd conv=swab 2>/dev/null | rev
} }
otool_args=
otool() {
command otool $otool_args $*
}
declare -a extra_classnames_files
inspect_binary() { inspect_binary() {
inspect_mode="$1" inspect_mode="$1"
echo "🔎 Inspecting binary '$target'..."
if [ ! -f "$target" ]; then
echo " 💥 Target does not exist!"
exit 1
fi
read -a mach_header <<< "$(otool -h "$target" -v | tail -n 1)"
if [ "${mach_header[1]}" != "X86_64" ]; then
echo " 💥 Binary is not 64-bit, only 64-bit binaries are supported!"
exit 1
fi
classnames_section="__objc_classname" classnames_section="__objc_classname"
classnames=$(otool -v -s __TEXT $classnames_section "$target" | tail -n +3) classnames=$(otool -v -s __TEXT $classnames_section "$target" | tail -n +3)
if [ -z "$classnames" ]; then if [ -z "$classnames" ]; then
@ -143,6 +140,7 @@ inspect_binary() {
done <<< "$classnames" done <<< "$classnames"
extra_classnames_file="$(mktemp -t ${classnames_section}_additions).S" extra_classnames_file="$(mktemp -t ${classnames_section}_additions).S"
extra_classnames_files+=("$extra_classnames_file")
if [ "$inspect_mode" == "inject_classnames" ]; then if [ "$inspect_mode" == "inject_classnames" ]; then
echo " ℹ️ Class names have not been namespaced, adding suffix '$suffix'..." echo " ℹ️ Class names have not been namespaced, adding suffix '$suffix'..."
@ -213,6 +211,8 @@ inspect_binary() {
class_type="class" class_type="class"
fi fi
name_offset=$(($name_offset + $arch_offset))
echo " 🔨 Patching class_ro_t at $address ($class_type) from $classname_address ($classname) to $newclassname_address ($newclassname)" echo " 🔨 Patching class_ro_t at $address ($class_type) from $classname_address ($classname) to $newclassname_address ($newclassname)"
echo ${newclassname_address: -8} | rev | dd conv=swab 2>/dev/null | xxd -p -r -seek $name_offset -l 4 - "$target" echo ${newclassname_address: -8} | rev | dd conv=swab 2>/dev/null | xxd -p -r -seek $name_offset -l 4 - "$target"
fi fi
@ -222,13 +222,43 @@ inspect_binary() {
echo "🔩 Linking binary using '$original_ld'..." echo "🔩 Linking binary using '$original_ld'..."
link_binary link_binary
inspect_binary inject_classnames echo "🔎 Inspecting binary '$target'..."
if [ $? -ne 0 ]; then if [ ! -f "$target" ]; then
exit echo " 💥 Target does not exist!"
exit 1
fi fi
echo "🔩 Re-linking binary with extra __objc_classname section..." read -a mach_header <<< "$(otool -h "$target" -v | tail -n 1)"
link_binary $extra_classnames_file if [ "${mach_header[0]}" != "MH_MAGIC_64" ]; then
echo " 💥 Binary is not 64-bit, only 64-bit binaries are supported!"
exit 1
fi
inspect_binary patch_classes architectures=$(otool -f -v $target | grep architecture)
setup_arch() {
arch="$1"
if [ ! -z "$arch" ]; then
otool_args="-arch $arch"
offset=$(otool -f -v $target | grep -A 6 "architecture $arch" | grep offset)
offset="${offset##*( )}"
arch_offset="$(echo $offset | cut -d ' ' -f 2)"
echo "🤖 Processing architecture '$arch' at offset $arch_offset..."
fi
}
while read -a arch; do
setup_arch "${arch[1]}"
inspect_binary inject_classnames
if [ $? -ne 0 ]; then
exit
fi
done <<< "$architectures"
echo "🔩 Re-linking binary with extra __objc_classname section(s)..."
link_binary "${extra_classnames_files[@]}"
while read -a arch; do
setup_arch "${arch[1]}"
inspect_binary patch_classes
done <<< "$architectures"