diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-27 12:40:58 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-27 12:40:58 +0000 |
| commit | 0b9ea52a4deeddf07798ece50f1c75d7de101baa (patch) | |
| tree | 23e4dc323ed06dbd274c969bdd51e371fad0dd9f /usr/src/grub | |
| parent | a0fae2e039f343951fa97d02c576ee3d45c877d1 (diff) | |
| parent | c5832a5333c189dfa346a3c1edac9fa39e1de4cb (diff) | |
| download | illumos-joyent-0b9ea52a4deeddf07798ece50f1c75d7de101baa.tar.gz | |
[illumos-gate merge]
commit c5832a5333c189dfa346a3c1edac9fa39e1de4cb
12002 async unlinked drain
commit e2336878c3b2087bcf5c52436847f37afaec8666
11960 Add topo module and hdl api for freeing string array
commit bb51a979b2badfaa6cf79bcb781b23aa6c1502f2
12021 zfs_diff tests missing Makefile deps
commit 05c00ec58206e104da9853d2117cf39602f4d5ee
12010 extra whitespace in mmap(2)
commit f52943a93040563107b95bccb9db87d9971ef47d
12016 Use of GNU ld should explicitly specify the required output format
commit a64e1e23aa6dde2e865402bb20dde999f835fdc5
11996 format: modify should not ask for GPT partition 7
commit d30992fa3989ef47543839be59b8c86165285ec4
11995 format: efi usable size is missing 1 sector
Conflicts:
usr/src/lib/fm/topo/libtopo/common/topo_string.c
usr/src/lib/fm/topo/libtopo/common/topo_mod.h
usr/src/lib/fm/topo/libtopo/common/mapfile-vers
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/Makefile.solaris.defs | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage1/Makefile.solaris | 5 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/Makefile.solaris | 21 |
3 files changed, 15 insertions, 13 deletions
diff --git a/usr/src/grub/grub-0.97/Makefile.solaris.defs b/usr/src/grub/grub-0.97/Makefile.solaris.defs index faf41925c6..86e79c484b 100644 --- a/usr/src/grub/grub-0.97/Makefile.solaris.defs +++ b/usr/src/grub/grub-0.97/Makefile.solaris.defs @@ -2,6 +2,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright 2016 Nexenta Systems, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master @@ -70,6 +71,7 @@ CPPFLAGS = $(DEFS) $(INCLUDES) $(WARNFLAGS) \ $(t.ENVCPPFLAGS4:I,%=-nostdinc -isystem %) CCLD = $(GNU_ROOT)/bin/gld +GLDTARGET = -melf_i386_sol2 LDFLAGS = $(BASE_LDFLAGS) LINKFLAGS = -g LINK = $(CCLD) $(LINKFLAGS) $(LDFLAGS) diff --git a/usr/src/grub/grub-0.97/stage1/Makefile.solaris b/usr/src/grub/grub-0.97/stage1/Makefile.solaris index d5d34b9d1f..2873a21a17 100644 --- a/usr/src/grub/grub-0.97/stage1/Makefile.solaris +++ b/usr/src/grub/grub-0.97/stage1/Makefile.solaris @@ -2,7 +2,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../Makefile.grub include ../Makefile.solaris.defs @@ -13,10 +13,9 @@ include ../Makefile.solaris.defs .exec: $(OBJCOPY) -O binary $< $@ - INCLUDES = -I. -I.. CCASFLAGS += -O2 -fno-builtin -nostdinc -LDFLAGS += -nostdlib -N -Ttext 7C00 +LDFLAGS += -nostdlib -N -Ttext 7C00 $(GLDTARGET) LIBS = diff --git a/usr/src/grub/grub-0.97/stage2/Makefile.solaris b/usr/src/grub/grub-0.97/stage2/Makefile.solaris index 925092fd4d..1c70f2a71b 100644 --- a/usr/src/grub/grub-0.97/stage2/Makefile.solaris +++ b/usr/src/grub/grub-0.97/stage2/Makefile.solaris @@ -4,6 +4,7 @@ # Copyright (c) 2013 by Saso Kiselkov. All rights reserved. # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2016 Nexenta Systems, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../Makefile.grub include ../Makefile.solaris.defs @@ -43,12 +44,12 @@ STAGE2_CFLAGS = -Os -fno-builtin -nostdinc \ $(STAGE2_NETBOOT)STAGE2_CFLAGS += $(NETBOOT_CFLAGS) #STAGE2_CFLAGS += $(HERCULES_CFLAGS) -NBLOADER_LINK = -nostdlib -N -Ttext 0 -PRE_STAGE2_LINK = -nostdlib -N -Ttext 8200 -PXELOADER_LINK = -nostdlib -N -Ttext 7C00 -STAGE1_5_LINK = -nostdlib -N -Ttext 2000 -START_ELTORITO_LINK = -nostdlib -N -Ttext 7C00 -START_LINK = -nostdlib -N -Ttext 8000 +NBLOADER_LINK = -nostdlib -N -Ttext 0 $(GLDTARGET) +PRE_STAGE2_LINK = -nostdlib -N -Ttext 8200 $(GLDTARGET) +PXELOADER_LINK = -nostdlib -N -Ttext 7C00 $(GLDTARGET) +STAGE1_5_LINK = -nostdlib -N -Ttext 2000 $(GLDTARGET) +START_ELTORITO_LINK = -nostdlib -N -Ttext 7C00 $(GLDTARGET) +START_LINK = -nostdlib -N -Ttext 8000 $(GLDTARGET) LIBDRIVERS = ../netboot/libdrivers.a @@ -446,13 +447,13 @@ REISERFS_STAGE1_5_OBJS = reiserfs_stage1_5_exec-bios.o \ reiserfs_stage1_5_exec-fsys_reiserfs.o \ reiserfs_stage1_5_exec-moddiv.o \ reiserfs_stage1_5_exec-stage1_5.o - + $(REISERFS_STAGE1_5_EXEC) := LDFLAGS = $(BASE_LDFLAGS) $(STAGE1_5_LINK) - + $(REISERFS_STAGE1_5_ASMOBJS) := CCASFLAGS = $(BASE_CCASFLAGS) \ $(STAGE1_5_CFLAGS) \ -DFSYS_REISERFS=1 -DNO_BLOCK_FILES=1 - + $(REISERFS_STAGE1_5_OBJS) := CFLAGS = $(BASE_CFLAGS) $(STAGE1_5_CFLAGS) \ -DFSYS_REISERFS=1 -DNO_BLOCK_FILES=1 @@ -678,7 +679,7 @@ $(LIBGRUB_OBJS): $$(@:libgrub_a-%.o=%.c) # # Diskless # -$(DISKLESS_EXEC): $(DISKLESS_ASMOBJS) $(DISKLESS_OBJS) +$(DISKLESS_EXEC): $(DISKLESS_ASMOBJS) $(DISKLESS_OBJS) $(RM) $@ $(LINK) -o $@ $(DISKLESS_ASMOBJS) $(DISKLESS_OBJS) $(LIBS) |