build.sh: support arm32

diff --git a/GNUmakefile b/GNUmakefile
index e86294c7c2b14c18122847096199164da277b5eb..438ff73078b80d6062ff76b9030fffaab282ae52 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -175,7 +175,7 @@ help:
        @echo "macosx-x86-32"
        @echo "macosx-x86-64"
        @echo "macosx-x86-fat"
-       @echo "macosx-arm64"
+       @echo "macosx-arm-64"
        @echo "windows-x86-32"
        @echo "windows-x86-64"
        @echo ""
@@ -203,8 +203,8 @@ macosx-x86-64:
 macosx-x86-fat:
        $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
 
-macosx-arm64:
-       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm64
+macosx-arm-64:
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm.64
 
 linux-arm-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.32

diff --git a/build.sh b/build.sh
index fb092d96a455a1bf1f68154c089bcf95401cd3ba..62341117ffc4bafcd30c79983ce4193f9edf9646 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -248,15 +248,15 @@ find_architecture() {
        ppc64) ARCH=ppc ;;
        *86) ARCH=x86 ;;
        *86_64) ARCH=x86 ;;
-       aarch64) ARCH=arm64 ;;
-       arm64) ARCH=arm64 ;;
-       iPhone5*[3-9]) ARCH=arm64 ;;
-       iPhone[6-9]*) ARCH=arm64 ;;
-       iPhone[1-9][0-9]*) ARCH=arm64 ;;
-       iPad[4-9]*) ARCH=arm64 ;;
-       iPad[1-9][0-9]*) ARCH=arm64 ;;
-       AppleTV[5-9]*) ARCH=arm64 ;;
-       AppleTV[1-9][0-9]*) ARCH=arm64 ;;
+       aarch64) ARCH=arm ;;
+       arm64) ARCH=arm ;;
+       iPhone5*[3-9]) ARCH=arm ;;
+       iPhone[6-9]*) ARCH=arm ;;
+       iPhone[1-9][0-9]*) ARCH=arm ;;
+       iPad[4-9]*) ARCH=arm ;;
+       iPad[1-9][0-9]*) ARCH=arm ;;
+       AppleTV[5-9]*) ARCH=arm ;;
+       AppleTV[1-9][0-9]*) ARCH=arm ;;
        "Power Macintosh") ARCH=ppc ;;
     esac
 }
@@ -363,29 +363,11 @@ check_os_arch_word() {
 
 set_build_info() {
     check_os_arch_word
-    if [[ $OS == linux && $ARCH == ppc ]] ; then
-        MAKE_IMAGE_TARGET=linux-ppc.32
-        MAKE_TARGET=linux-ppc-32
-    elif [[ $OS == linux && $ARCH == arm64 ]] ; then
-        MAKE_IMAGE_TARGET=unix-arm.64
-        MAKE_TARGET=linux-arm-64
-    elif [[ $OS == macosx && $ARCH == arm64 ]] ; then
-        MAKE_IMAGE_TARGET=unix-arm.64
-        MAKE_TARGET=macosx-arm64
-    elif [[ $OS == windows && $ARCH == x86 && $WORD == 64 ]] ; then
-        MAKE_IMAGE_TARGET=windows-x86.64
-        MAKE_TARGET=windows-x86-64
-    elif [[ $OS == windows && $ARCH == x86 && $WORD == 32 ]] ; then
-        MAKE_IMAGE_TARGET=windows-x86.32
-        MAKE_TARGET=windows-x86-32
-    elif [[ $ARCH == x86 && $WORD == 64 ]] ; then
-        MAKE_IMAGE_TARGET=unix-x86.64
-        MAKE_TARGET=$OS-x86-64
-    elif [[ $ARCH == x86 && $WORD == 32 ]] ; then
-        MAKE_IMAGE_TARGET=unix-x86.32
-        MAKE_TARGET=$OS-x86-32
+    if [[ $OS == "windows" ]] ; then
+        MAKE_IMAGE_TARGET=windows-$ARCH.$WORD
+        MAKE_TARGET=$OS-$ARCH-$WORD
     else
-        MAKE_IMAGE_TARGET=$ARCH.$WORD
+        MAKE_IMAGE_TARGET=unix-$ARCH.$WORD
         MAKE_TARGET=$OS-$ARCH-$WORD
     fi
     BOOT_IMAGE=boot.$MAKE_IMAGE_TARGET.image

diff --git a/vm/Config.macosx.arm.64 b/vm/Config.macosx.arm.64
new file mode 100644 (file)
index 0000000..756ee4b
--- /dev/null
+++ b/vm/Config.macosx.arm.64
@@ -0,0 +1,5 @@
+include vm/Config.macosx
+include vm/Config.arm.64
+
+PLAF_DLL_OBJS += vm/cpu-arm.64.cpp
+PLAF_MASTER_HEADERS += vm/os-macosx-arm64.hpp

diff --git a/vm/Config.macosx.arm64 b/vm/Config.macosx.arm64
deleted file mode 100644 (file)
index 756ee4b..0000000
--- a/vm/Config.macosx.arm64
+++ /dev/null
@@ -1,5 +0,0 @@
-include vm/Config.macosx
-include vm/Config.arm.64
-
-PLAF_DLL_OBJS += vm/cpu-arm.64.cpp
-PLAF_MASTER_HEADERS += vm/os-macosx-arm64.hpp