summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2018-01-16 10:08:08 -0800
committerOri Bernstein <ori@eigenstate.org>2018-01-16 10:08:08 -0800
commitf698f29852c65149698e6018f2c5d312cf9b2812 (patch)
treeb2e2a93952d29cfce5dbbf59ac76d5dc8a118d5a
parent012c761ef5952366fe4c9be95ad8aa250afe6154 (diff)
parent4db2895318842a451a5036652ea9373667a603b1 (diff)
downloadmc-f698f29852c65149698e6018f2c5d312cf9b2812.tar.gz
Merge branch 'clink-obsd' of https://github.com/moreais/mc
-rwxr-xr-xconfigure9
-rw-r--r--mbld/config+plan9-x64.myr1
-rw-r--r--mbld/deps.myr11
-rw-r--r--rt/start-openbsd.s12
4 files changed, 28 insertions, 5 deletions
diff --git a/configure b/configure
index 088e8c2..c1d433c 100755
--- a/configure
+++ b/configure
@@ -49,6 +49,8 @@ case $OS in
echo export INST_MAN=$prefix/share/man/man >> config.mk
echo 'const Sys = "Linux"' >> mbld/config.myr
echo 'const Linkcmd = ["ld"]' >> mbld/config.myr
+ echo 'const Dlflags = ["-dynamic-linker",' \
+ '"/lib64/ld-linux-x86-64.so.2"]' >> mbld/config.myr
echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
;;
*Darwin*)
@@ -64,6 +66,7 @@ case $OS in
'"-macosx_version_min", "10.6",'\
']' >> mbld/config.myr
echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
+ echo 'const Dlflags : byte[:][:] = [][:]' >> mbld/config.myr
env='[("MACOSX_DEPLOYMENT_TARGET", "10.6")][:]'
;;
*FreeBSD*)
@@ -71,6 +74,7 @@ case $OS in
echo export INST_MAN=$prefix/man/man >> config.mk
echo 'const Sys = "FreeBSD"' >> mbld/config.myr
echo 'const Linkcmd = ["ld"]' >> mbld/config.myr
+ echo 'const Dlflags : byte[:][:] = [][:]' >> mbld/config.myr
echo "const Manpath = \"man/man\"" >> mbld/config.myr
;;
*NetBSD*)
@@ -78,13 +82,16 @@ case $OS in
echo export INST_MAN=$prefix/man/man >> config.mk
echo 'const Sys = "NetBSD"' >> mbld/config.myr
echo 'const Linkcmd = ["ld"]' >> mbld/config.myr
+ echo 'const Dlflags : byte[:][:] = [][:]' >> mbld/config.myr
echo "const Manpath = \"man/man\"" >> mbld/config.myr
;;
*OpenBSD*)
echo 'export SYS=openbsd' >> config.mk
echo export INST_MAN=$prefix/man/man >> config.mk
echo 'const Sys = "OpenBSD"' >> mbld/config.myr
- echo 'const Linkcmd = ["ld", "-static", "-nopie"]' >> mbld/config.myr
+ echo 'const Linkcmd = ["ld", "-nopie"]' >> mbld/config.myr
+ echo 'const Dlflags = ["-dynamic-linker",' \
+ '"/usr/libexec/ld.so"]' >> mbld/config.myr
echo "const Manpath = \"man/man\"" >> mbld/config.myr
;;
*)
diff --git a/mbld/config+plan9-x64.myr b/mbld/config+plan9-x64.myr
index b13fedc..e246d4d 100644
--- a/mbld/config+plan9-x64.myr
+++ b/mbld/config+plan9-x64.myr
@@ -4,6 +4,7 @@ pkg config =
const Sys = "Plan9"
const Objsuffix = ".6"
const Linkcmd = ["6l", "-l"]
+ const Dlflags : byte[:][:] = [][:]
const Arcmd = ["ar", "u"]
const Ascmd = ["6a"]
const Directlib = true
diff --git a/mbld/deps.myr b/mbld/deps.myr
index c312f5c..cae46b1 100644
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -453,18 +453,21 @@ const linkcmd = {b, n, mt, bin, libs, dynlibs, istest
std.slpush(&n.cmd, std.sldup(o))
;;
- dynlink = addlibs(b, &n.cmd, libs, mt.incpath)
+ dynlink = addlibs(b, &n.cmd, libs, mt.incpath) || mt.isdyn
for l : dynlibs
std.slpush(&n.cmd, std.fmt("-l{}", l))
;;
+ if dynlink
+ for f : config.Dlflags
+ std.slpush(&n.cmd, std.sldup(f))
+ ;;
+ ;;
+
/* OSX warns if we don't add a version */
if std.sleq(opt_sys, "osx")
std.slpush(&n.cmd, std.sldup("-macosx_version_min"))
std.slpush(&n.cmd, std.sldup("10.6"))
- elif std.sleq(opt_sys, "linux") && (dynlink || mt.isdyn)
- std.slpush(&n.cmd, std.sldup("-dynamic-linker"))
- std.slpush(&n.cmd, std.sldup("/lib64/ld-linux-x86-64.so.2"))
;;
}
diff --git a/rt/start-openbsd.s b/rt/start-openbsd.s
index 9fd8610..c0e061a 100644
--- a/rt/start-openbsd.s
+++ b/rt/start-openbsd.s
@@ -60,6 +60,18 @@ _start:
movq $1,%rax
syscall
+/*
+ * provide __guard_local for if we are
+ * linking against libc
+ */
+.section ".openbsd.randomdata", "aw"
+ .global __guard_local
+ .hidden __guard_local
+ .type __guard_local, "object"
+ .p2align 3
+__guard_local:
+ .quad 0
+ .size __guard_local, 8
.section ".note.openbsd.ident", "a"
.p2align 2