Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #308 from rneswold/patches 

Add (experimental) support for NetBSD/arm.
master
Gabriel Scherer 2015-12-06 10:21:07 +01:00
parent b2449a3120 2893da8be1
commit 71c4f8b68a
9 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -435,6 +435,8 @@ Features wishes:
This changes PR#6816 a little bit by reading the literal [123a] as a single token that can
later be rewritten by a ppx preprocessor.
(Hugo Heuzard)
- GPR#308: add experimental support for NetBSD/arm (verified on RaspberryPi)
(Rich Neswold)
OCaml 4.02.3 (27 Jul 2015):
---------------------------

3
README
View File

@ -28,9 +28,10 @@ Tier 1 (actively used and maintained by the core OCaml team):
Tier 2 (maintained when possible, with help from users):
AMD64 FreeBSD, OpenBSD
AMD64 FreeBSD, OpenBSD, NetBSD
IA32 (Pentium) NetBSD, OpenBSD, Solaris 9
PowerPC NetBSD
ARM NetBSD
SPARC Solaris, Linux, NetBSD
Other operating systems for the processors above have not been tested,

2
asmcomp/arm/arch.ml
View File

@ -22,7 +22,7 @@ type fpu = Soft | VFPv2 | VFPv3_D16 | VFPv3
let abi =
match Config.system with
"linux_eabi" | "freebsd" -> EABI
| "linux_eabihf" -> EABI_HF
| "linux_eabihf" | "netbsd" -> EABI_HF
| _ -> assert false
let string_of_arch = function

4
asmcomp/arm/emit.mlp
View File

@ -820,7 +820,7 @@ let rec emit_all ninstr i =
let emit_profile() =
match Config.system with
"linux_eabi" | "linux_eabihf" ->
"linux_eabi" | "linux_eabihf" | "netbsd" ->
` push \{lr}\n`;
` {emit_call "__gnu_mcount_nc"}\n`
| _ -> ()
@ -947,7 +947,7 @@ let end_assembly () =
` .type {emit_symbol lbl}, %object\n`;
` .size {emit_symbol lbl}, .-{emit_symbol lbl}\n`;
begin match Config.system with
"linux_eabihf" | "linux_eabi" ->
"linux_eabihf" | "linux_eabi" | "netbsd" ->
(* Mark stack as non-executable *)
` .section .note.GNU-stack,\"\",%progbits\n`
| _ -> ()

2
asmcomp/arm64/emit.mlp
View File

@ -866,7 +866,7 @@ let rec emit_all i =
let emit_profile() = () (* TODO *)
(*
match Config.system with
"linux_eabi" | "linux_eabihf" ->
"linux_eabi" | "linux_eabihf" | "netbsd" ->
` push \{lr}\n`;
` {emit_call "__gnu_mcount_nc"}\n`
| _ -> ()

30
asmrun/arm.S
View File

@ -44,6 +44,26 @@
cmp \reg, #0
beq \lbl
.endm
#elif defined(SYS_netbsd)
#if defined(MODEL_armv6)
.arch armv6
.fpu vfpv2
.arm
/* Compatibility macros */
.macro cbz reg, lbl
cmp \reg, #0
beq \lbl
.endm
#elif defined(MODEL_armv7)
.arch armv7-a
.fpu vfpv3-d16
.thumb
#else
#error "Only NetBSD eabihf supported"
#endif
#elif defined(SYS_freebsd)
.arch armv6
.arm
@ -73,7 +93,7 @@ alloc_limit .req r11
/* Support for profiling with gprof */
#if defined(PROFILING) && (defined(SYS_linux_eabihf) || defined(SYS_linux_eabi))
#if defined(PROFILING) && (defined(SYS_linux_eabihf) || defined(SYS_linux_eabi) || defined(SYS_netbsd))
#define PROFILE \
push {lr}; CFI_ADJUST(4); \
bl __gnu_mcount_nc; CFI_ADJUST(-4)
@ -98,7 +118,7 @@ caml_call_gc:
/* Record lowest stack address */
ldr r12, =caml_bottom_of_stack
str sp, [r12]
#if defined(SYS_linux_eabihf)
#if defined(SYS_linux_eabihf) || defined(SYS_netbsd)
/* Save caller floating-point registers on the stack */
vpush {d0-d7}; CFI_ADJUST(64)
#endif
@ -117,7 +137,7 @@ caml_call_gc:
bl caml_garbage_collection
/* Restore integer registers and return address from the stack */
pop {r0-r7,r12,lr}; CFI_ADJUST(-40)
#if defined(SYS_linux_eabihf)
#if defined(SYS_linux_eabihf) || defined(SYS_netbsd)
/* Restore floating-point registers from the stack */
vpop {d0-d7}; CFI_ADJUST(-64)
#endif
@ -272,7 +292,7 @@ caml_start_program:
/* Arguments to the OCaml code are in r0...r3 */
.Ljump_to_caml:
#if defined(SYS_linux_eabihf)
#if defined(SYS_linux_eabihf) || defined(SYS_netbsd)
/* Save callee-save floating-point registers */
vpush {d8-d15}; CFI_ADJUST(64)
#endif
@ -327,7 +347,7 @@ caml_start_program:
str alloc_ptr, [r4]
/* Reload callee-save registers and return address */
pop {r4-r8,r10,r11,lr}; CFI_ADJUST(-32)
#if defined(SYS_linux_eabihf)
#if defined(SYS_linux_eabihf) || defined(SYS_netbsd)
/* Reload callee-save floating-point registers */
vpop {d8-d15}; CFI_ADJUST(-64)
#endif

4
config/auto-aux/gethostbyaddr.c
View File

@ -19,6 +19,10 @@
#include <sys/types.h>
#include <netdb.h>
#ifdef SYS_netbsd
#error "this OS doesn't have gethostbyaddr_r"
#endif
int main(int argc, char ** argv)
{
#if NUM_ARGS == 7

4
config/auto-aux/gethostbyname.c
View File

@ -19,6 +19,10 @@
#include <sys/types.h>
#include <netdb.h>
#ifdef SYS_netbsd
#error "this OS doesn't have gethostbyname_r"
#endif
int main(int argc, char ** argv)
{
#if NUM_ARGS == 5

8
configure vendored
View File

@ -778,6 +778,7 @@ if test $with_sharedlibs = "yes"; then
i[3456]86-*-haiku*) natdynlink=true;;
arm*-*-linux*) natdynlink=true;;
arm*-*-freebsd*) natdynlink=true;;
earm*-*-netbsd*) natdynlink=true;;
aarch64-*-linux*) natdynlink=true;;
esac
fi
@ -831,6 +832,8 @@ case "$target" in
armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;;
armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;;
earmv6*-*-netbsd*) arch=arm; model=armv6; system=netbsd;;
earmv7*-*-netbsd*) arch=arm; model=armv7; system=netbsd;;
armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;;
armv5*-*-linux-gnueabi) arch=arm; model=armv5; system=linux_eabi;;
arm*-*-linux-gnueabi) arch=arm; system=linux_eabi;;
@ -935,6 +938,7 @@ case "$arch,$system" in
amd64,openbsd) profiling='prof';;
amd64,freebsd) profiling='prof';;
amd64,netbsd) profiling='prof';;
arm,netbsd) profiling='prof';;
amd64,gnu) profiling='prof';;
arm,linux*) profiling='prof';;
power,elf) profiling='prof';;
@ -1326,7 +1330,7 @@ fi
nargs=none
for i in 5 6; do
if sh ./trycompile -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi
if sh ./trycompile -DSYS_${system} -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi
done
if test $nargs != "none"; then
inf "gethostbyname_r() found (with ${nargs} arguments)."
@ -1335,7 +1339,7 @@ fi
nargs=none
for i in 7 8; do
if sh ./trycompile -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi
if sh ./trycompile -DSYS_${system} -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi
done
if test $nargs != "none"; then
inf "gethostbyaddr_r() found (with ${nargs} arguments)."