no auto set os version in build.sh + bugfix

Author: Antibioticss

.github/workflows/c-cpp.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: build macos libraries
-        run: rm -rf build && ./build.sh -t macosx
+        run: ./build.sh -t macosx -v 10.15
 
       - name: upload build artifact
         uses: actions/upload-artifact@v4
@@ -27,7 +27,7 @@ jobs:
           compression-level: 9
 
       - name: build ios libraries
-        run: rm -rf build && ./build.sh -t iphoneos
+        run: ./build.sh -t iphoneos -v 12.0
 
       - name: upload build artifact
         uses: actions/upload-artifact@v4

Makefile

@@ -1,7 +1,7 @@
 ARCH   ?= $(shell uname -m)
 TARGET ?= macosx
 
-CFLAGS  := -arch $(ARCH) -O3 -Wall -Wshadow
+CFLAGS  := -arch $(ARCH) -Os -Wall -Wshadow
 LDFLAGS := -flto=full -lobjc
 ASFLAGS := -arch $(ARCH)
 

build.sh

@@ -49,33 +49,31 @@ if (($#archs2build == 0)) {
     }
 }
 
-if [[ $sysver == "" ]] {
-    if [[ $target == macosx ]] {
-        sysver=10.15
-    } elif [[ $target == iphoneos ]] {
-        sysver=12.0
-    } else {
-        echo "unknown target: $target!"
-        exit 1
-    }
-}
+local build_arg=(TARGET=$target)
 
-local build_arg=(TARGET=$target MIN_OSVER=$sysver)
+if [[ $sysver != "" ]] {
+    build_arg+=(MIN_OSVER=$sysver)
+}
 
 if (($compact == 1)) {
     build_arg+=(COMPACT=1)
 }
 
 for i ($archs2build) {
-    mkdir -p build/$i
-    make clean ARCH=$i && make all ARCH=$i $build_arg
-    mv libtinyhook.a libtinyhook.dylib build/$i
+    (set -x # print command before executing
+        mkdir -p build/$i
+        make clean ARCH=$i && make all ARCH=$i $build_arg
+        cp libtinyhook.a libtinyhook.dylib build/$i
+    )
 }
 
 if (($#archs2build > 1)) {
-    rm -rf build/universal
-    mkdir -p build/universal
-    lipo -create -o build/universal/libtinyhook.a build/*/libtinyhook.a
-    lipo -create -o build/universal/libtinyhook.dylib build/*/libtinyhook.dylib
-    cp build/universal/libtinyhook.a build/universal/libtinyhook.dylib .
+    (set -x
+        cd build
+        mkdir -p universal
+        rm -f universal/libtinyhook.a universal/libtinyhook.dylib
+        lipo -create -o universal/libtinyhook.a ${archs2build/%//libtinyhook.a}
+        lipo -create -o universal/libtinyhook.dylib ${archs2build/%//libtinyhook.dylib}
+        cp universal/libtinyhook.a universal/libtinyhook.dylib ..
+    )
 }

src/tinyhook.c

@@ -78,7 +78,7 @@ static inline void save_header(void **src, void **dst, int min_len) {
         insn = *(uint32_t *)*src;
         if (((insn ^ 0x90000000) & 0x9f000000) == 0) {
             // adrp
-            // modify the immediate (len 4 -> 4)
+            // modify the immediate (len: 4 -> 4)
             int64_t len = (insn >> 29 & 0x3) | ((insn >> 3) & 0x1ffffc);
             len += ((int64_t)*src >> 12) - ((int64_t)*dst >> 12);
             insn &= 0x9f00001f; // clean the immediate