From f3bf959aeb677492160fc7922dbb2015776cb2d2 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 15 Oct 2017 11:13:22 -0400 Subject: midipix target: integrated the ldso design options (-mldso, -mvrfs). --- gcc/config/i386/midipix.opt | 4 ++++ libc/cbb-musl-pe.h | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/config/i386/midipix.opt b/gcc/config/i386/midipix.opt index e2d30030e..91ffdc2c3 100644 --- a/gcc/config/i386/midipix.opt +++ b/gcc/config/i386/midipix.opt @@ -47,4 +47,8 @@ mldso Target use a dynamic loader +mvrfs +Target +default to a virtual root file system (aka standalone application) + ; Retain blank line above diff --git a/libc/cbb-musl-pe.h b/libc/cbb-musl-pe.h index 88ac3ace2..4495da880 100644 --- a/libc/cbb-musl-pe.h +++ b/libc/cbb-musl-pe.h @@ -80,16 +80,17 @@ extern "C" { "%{static:" \ " --as-needed -lntapi" \ " --as-needed -ldalist" \ - " --as-needed -lpemagine}" + " --as-needed -lpemagine}"\ + "%{!shared:%{mldso|mvrfs:" \ + " --as-needed -lldso}}" #undef STARTFILE_SPEC #define STARTFILE_SPEC "%R/lib/crti.o " \ - "%{!shared:" \ - "%{mldso:%R/lib/crtldso.o}} " \ - "%{!shared:%R/lib/" \ - "%{static:S}crt1.o}} " \ "%{!shared:%{mposix:%R/lib/crtposix.o}} " \ "%{!shared:%{mdinga:%R/lib/crtdinga.o}} " \ + "%{!shared:%{mldso:%R/lib/crtldso.o}} " \ + "%{!shared:%{mvrfs:%R/lib/crtvrfs.o}} " \ + "%{!shared:%R/lib/%{static:S}crt1.o} " \ "%{shared:%R/lib/crte.o} " \ "%{static:crtbeginT.o%s;" \ "shared|pie:crtbeginS.o%s;" \ -- cgit v1.2.3