diff options
| author | Toomas Soome <tsoome@me.com> | 2019-04-27 08:10:53 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-04-30 18:05:27 +0300 |
| commit | 40320bdcdf7a073effbd3872d29e2bd595eae22c (patch) | |
| tree | 48d0ae52d764ef07bcc7b0ff989cf3aab6ccb845 /usr/src | |
| parent | adf7a658ee3948276f007c3374ca1ecbb5ede9c5 (diff) | |
| download | illumos-gate-40320bdcdf7a073effbd3872d29e2bd595eae22c.tar.gz | |
10858 loader: add elf_i386_sol2 option where we do not use ld script
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/sys/boot/i386/gptzfsboot/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/isoboot/Makefile | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile index 466a2f1276..b7a73288cc 100644 --- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile +++ b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile @@ -68,6 +68,7 @@ OBJS = multiboot.o zfsboot.o sio.o cons.o devopen.o \ part.o := CPPFLAGS += -I$(ZLIB) smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS smbios.o := CPPFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID +gptldr.out := LD_FLAGS += -m elf_i386_sol2 CLEANFILES= gptzfsboot $(OBJS) diff --git a/usr/src/boot/sys/boot/i386/isoboot/Makefile b/usr/src/boot/sys/boot/i386/isoboot/Makefile index fd23e8e2a3..89130a52c9 100644 --- a/usr/src/boot/sys/boot/i386/isoboot/Makefile +++ b/usr/src/boot/sys/boot/i386/isoboot/Makefile @@ -46,6 +46,8 @@ LDSCRIPT= ../boot.ldscript LD_FLAGS= -static -N --gc-sections LIBSTAND= ../../libstand/$(MACH)/libstand.a +gptldr.out := LD_FLAGS += -m elf_i386_sol2 + include ../Makefile.inc all: $(PROG) |