added arm support via cpfront

[cpc.git] / make.sh

diff --git a/make.sh b/make.sh
index ecd46c387609acb68e4b8ca1f9101d04454a88d9..9aa6e5247ff581ff08502098c5b2a29e5603532a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -33,11 +33,15 @@ usage() {
   echo "    -x                Do not link"
   echo "Processors:"
   echo "    486               Intel 486+"
+  echo "    arm               ARM 32-bit"
   echo "Targets:"
   echo "    native            Native"
   echo "    cpfront           Generic C"
   echo "Operation systems:"
   echo "    linux             GNU/Linux"
+  echo "Environment variables:"
+  echo "    CC                C compiler binary"
+  echo "    CFLAGS            C compiler options"
   exit 2
 }
 
@@ -100,13 +104,18 @@ cpfront_link() {
     do
       _list="$_list ${_out}/CodeC/${_module}.c"
     done
-    ### !!! ADD $CC $CFLAGS $LDFLAGS ###
-    gcc -m32 -g -O0 -lm -ldl -o "$_out/$_main" \
-      -Wno-int-conversion \
-      -Wno-int-to-pointer-cast \
-      -Wno-incompatible-pointer-types \
-      -Wno-implicit-function-declaration \
-      -I "$_this/C" "$_this/C/SYSTEM.c" $_list
+    local _cc_cflags=
+    case "$CC" in
+      *gcc)  _cc_cflags="-Wno-int-conversion -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types -Wno-implicit-function-declaration" ;;
+      *)  _cc_cflags="" ;;
+    esac
+    local _cpu_cflags=
+    case "$_cpu" in
+      486)  _cpu_cflags="-m32" ;;
+      arm)  _cpu_cflags="" ;;
+      *)  error "cpfront_link(): unsupported cpu $_cpu" ;;
+    esac
+    "$CC" $_cc_cflags $_cpu_cflags -lm -ldl $CFLAGS -o "${_main}" -I "$_this/C" "$_this/C/SYSTEM.c" $_list
   fi
 }
 
@@ -131,19 +140,17 @@ compile_all() {
   ### Compile POSIX bindings ###
   ###________________________###
 
-  case "$_system" in
-    linux)
-      compile C99/Mod/types.cp \
-        C99/Mod/sys_types.cp \
-        C99/Mod/stdlib.cp C99/Mod/stdio.cp C99/Mod/unistd.cp \
-        C99/Mod/dirent.cp C99/Mod/locale.cp C99/Mod/time.cp \
-        C99/Mod/sys_stat.cp C99/Mod/fcntl.cp C99/Mod/errno.cp \
-        C99/Mod/iconv.cp C99/Mod/wctype.cp C99/Mod/sys_mman.cp \
-        C99/Mod/dlfcn.cp C99/Mod/signal.cp C99/Mod/setjmp.cp \
-        C99/Mod/libgen.cp \
-        C99/Mod/macro.cp
-    ;;
-  esac
+  if $_useposix; then
+    compile Posix/Mod/Ctypes.cp \
+      Posix/Mod/Csys_types.cp \
+      Posix/Mod/Cstdlib.cp Posix/Mod/Cstdio.cp Posix/Mod/Cunistd.cp \
+      Posix/Mod/Cdirent.cp Posix/Mod/Clocale.cp Posix/Mod/Ctime.cp \
+      Posix/Mod/Csys_stat.cp Posix/Mod/Cfcntl.cp Posix/Mod/Cerrno.cp \
+      Posix/Mod/Ciconv.cp Posix/Mod/Cwctype.cp Posix/Mod/Csys_mman.cp \
+      Posix/Mod/Cdlfcn.cp Posix/Mod/Csignal.cp Posix/Mod/Csetjmp.cp \
+      Posix/Mod/Clibgen.cp \
+      Posix/Mod/Cmacro.cp
+  fi
 
   ###^^^^^^^^^^^^^^^^^^^^^^^^^^^^###
   ### Compile BlackBox Framework ###
@@ -212,7 +219,7 @@ link_all() {
   fi
 
   link cpc486 \
-    C99types C99macro \
+    PosixCtypes PosixCmacro \
     Kernel Console Files Dates Math Strings Services Log \
     HostLang HostConsole HostFiles HostDates DswLog $_debug_module \
     DevCPM DevCPT DevCPS DevCPB DevCPP DevCPE DevCPH \
@@ -220,7 +227,7 @@ link_all() {
     DswDocuments DswCompiler486Main
 
   link cpl486 \
-    C99types C99macro \
+    PosixCtypes PosixCmacro \
     Kernel Console Files Math Strings Services Log \
     HostLang HostConsole HostFiles DswLog $_debug_module \
     Dev2LnkBase Dev2LnkChmod Dev2LnkLoad Dev2LnkWriteElf \
@@ -228,7 +235,7 @@ link_all() {
     DswLinker486Main
 
   link cpfront \
-    C99types C99macro \
+    PosixCtypes PosixCmacro \
     Kernel Console Files Dates Math Strings Services Log \
     HostLang HostConsole HostFiles HostDates DswLog $_debug_module \
     DevCPM DevCPT DevCPS DevCPB DevCPP DevCPE DevCPH \
@@ -265,12 +272,17 @@ _cpu="$1"
 _target="$2"
 _system="$3"
 
+if [ -z "$CC" ]; then
+  export CC=cc
+fi
+
 ###^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^###
 ### Check for supported cpu/target/os ###
 ###___________________________________###
 
 case "$_cpu" in
   386|486|586|686)  _cpu=486 ;;
+  arm|armv6|armv7)  _cpu=arm ;;
   "")  error "cpu not specified" ;;
   *)  error "unsupported cpu $_cpu" ;;
 esac
@@ -338,7 +350,9 @@ fi
 ### Copy sources for changed system ###
 ###_________________________________###
 
-$_docompile && rm -rf -- "$_out"
+if $_docompile; then
+  rm -rf -- "$_out"
+fi
 
 mkdir -p -- "$_out"
 _out="$(readlink -f "$_out")"