diff options
| -rw-r--r-- | gcc/config/i386/midipix.opt | 20 | ||||
| -rw-r--r-- | libc/cbb-musl-pe.h | 35 |
2 files changed, 4 insertions, 51 deletions
diff --git a/gcc/config/i386/midipix.opt b/gcc/config/i386/midipix.opt index a2c1fa259..2274d1f05 100644 --- a/gcc/config/i386/midipix.opt +++ b/gcc/config/i386/midipix.opt @@ -47,24 +47,4 @@ mldso Target use a dynamic loader -mldso-absolute-path -Target -use the dynamic loader located at an application-defined absolute path - -mldso-default-path -Target -use the dynamic loader located at C:\\midipix\\lib - -mldso-app-dir-only -Target -use the dynamic loader found in the same physical directory as the current process - -mldso-root-relative -Target -use the dynamic loader found in /lib under a root directory relative to the physical location of the current process - -mldso-kernel-driver -Target -load dynamic libraries via calls to a custom ldso kernel driver - ; Retain blank line above diff --git a/libc/cbb-musl-pe.h b/libc/cbb-musl-pe.h index bb5c8b794..5f9dbf05a 100644 --- a/libc/cbb-musl-pe.h +++ b/libc/cbb-musl-pe.h @@ -64,28 +64,12 @@ extern "C" { #undef CPP_SPEC_LDSO #define CPP_SPEC_LDSO "%{mldso:-D_LDSO} " -#undef CPP_SPEC_LDSO_ABSOLUTE_PATH -#define CPP_SPEC_LDSO_ABSOLUTE_PATH "%{mldso-absolute-path:-D_LDSO -D_LDSO_ABSOLUTE_PATH} " - -#undef CPP_SPEC_LDSO_DEFAULT_PATH -#define CPP_SPEC_LDSO_DEFAULT_PATH "%{mldso-default-path:-D_LDSO -D_LDSO_DEFAULT_PATH} " - -#undef CPP_SPEC_LDSO_APP_DIR_ONLY -#define CPP_SPEC_LDSO_APP_DIR_ONLY "%{mldso-app-dir-only:-D_LDSO -D_LDSO_APP_DIR_ONLY} " - -#undef CPP_SPEC_LDSO_KERNEL_DRIVER -#define CPP_SPEC_LDSO_KERNEL_DRIVER "%{mldso-kernel-driver:-D_LDSO -D_LDSO_KERNEL_DRIVER} " - #undef CPP_SPEC_NTAPI #define CPP_SPEC_NTAPI "%{mntapi:-ffreestanding} " #undef CPP_SPEC #define CPP_SPEC CPP_SPEC_POSIX \ CPP_SPEC_LDSO \ - CPP_SPEC_LDSO_ABSOLUTE_PATH \ - CPP_SPEC_LDSO_DEFAULT_PATH \ - CPP_SPEC_LDSO_APP_DIR_ONLY \ - CPP_SPEC_LDSO_KERNEL_DRIVER \ CPP_SPEC_NTAPI #undef LIB_SPEC @@ -100,21 +84,10 @@ extern "C" { #undef STARTFILE_SPEC #define STARTFILE_SPEC "%R/lib/crti.o " \ - "%{!shared:%{" \ - "mldso" \ - "|mldso-absolute-path" \ - "|mldso-default-path" \ - "|mldso-app-dir-only" \ - "|mldso-root-relative" \ - "|mldso-kernel-driver" \ - ":%R/lib/crtldso.o}} " \ - "%{!shared:%R/lib/%{" \ - "mldso-absolute-path:crtldsoa.o;" \ - "mldso-default-path:crtldsod.o;" \ - "mldso-app-dir-only:crtldson.o;" \ - "mldso-root-relative:crtldsor.o;" \ - "mldso-kernel-driver:crtldsok.o;" \ - ":%{static:S}crt1.o}} " \ + "%{!shared:" \ + "%{mldso:%R/lib/crtldso.o}} " \ + "%{!shared:%R/lib/" \ + "%{static:S}crt1.o}} " \ "%{!shared:%{mposix:%R/lib/crtposix.o}} " \ "%{!shared:%{mtty-console:%R/lib/crtdev.o}} " \ "%{shared:%R/lib/crte.o} " \ |