Project

General

Profile

Bug #8475

usr/src/boot should to use correct PATH to tools

Added by Igor Kozhukhov over 2 years ago. Updated over 2 years ago.

Status:
New
Priority:
Normal
Assignee:
Category:
-
Start date:
2017-07-08
Due date:
% Done:

0%

Estimated time:
Difficulty:
Medium
Tags:
needs-triage

Description

i can see different PATH to GNU tools for loader build and they should be updated.

example:

igor@z172:~/users/igor/dilos-illumos/usr/src/boot$ g diff .
diff --git a/usr/src/boot/sys/boot/efi/boot1/Makefile b/usr/src/boot/sys/boot/efi/boot1/Makefile
index b89e2148b1..09c7a308e4 100644
--- a/usr/src/boot/sys/boot/efi/boot1/Makefile
+++ b/usr/src/boot/sys/boot/efi/boot1/Makefile
@@ -18,9 +18,9 @@ include $(SRC)/Makefile.master
 include $(SRC)/boot/Makefile.version

 CC=    $(GCC_ROOT)/bin/gcc
-LD=    $(GNU_ROOT)/bin/gld
-OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
-OBJDUMP= $(GNU_ROOT)/bin/gobjdump
+LD=    /usr/bin/gld
+OBJCOPY= $(GNU_ROOT)/bin/objcopy
+OBJDUMP= $(GNU_ROOT)/bin/objdump

 PROG=          boot1.sym
 MACHINE=$(MACH64)
diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/sys/boot/efi/loader/Makefile
index b1c720cf8a..920af3e059 100644
--- a/usr/src/boot/sys/boot/efi/loader/Makefile
+++ b/usr/src/boot/sys/boot/efi/loader/Makefile
@@ -18,9 +18,9 @@ include $(SRC)/Makefile.master
 include $(SRC)/boot/Makefile.version

 CC=            $(GCC_ROOT)/bin/gcc
-LD=            $(GNU_ROOT)/bin/gld
-OBJCOPY=       $(GNU_ROOT)/bin/gobjcopy
-OBJDUMP=       $(GNU_ROOT)/bin/gobjdump
+LD=            /usr/bin/gld
+OBJCOPY=       $(GNU_ROOT)/bin/objcopy
+OBJDUMP=       $(GNU_ROOT)/bin/objdump

 PROG=          loader.sym
 MACHINE=       $(MACH64)
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
index 884135e333..618088ead1 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
+++ b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
@@ -22,7 +22,7 @@ include $(SRC)/boot/Makefile.version
 AS=    /usr/bin/gas
 LD=    /usr/bin/gld
 CC=    $(GCC_ROOT)/bin/gcc
-OBJCOPY=       /usr/bin/gobjcopy
+OBJCOPY=       $(GNU_ROOT)/bin/objcopy

 PROG=          gptzfsboot
 MAN=           gptzfsboot.8
diff --git a/usr/src/boot/sys/boot/i386/libi386/Makefile b/usr/src/boot/sys/boot/i386/libi386/Makefile
index fac96ea570..152157a5d4 100644
--- a/usr/src/boot/sys/boot/i386/libi386/Makefile
+++ b/usr/src/boot/sys/boot/i386/libi386/Makefile
@@ -28,7 +28,7 @@ clobber:

 AS=    /usr/bin/gas
 CC=    $(GCC_ROOT)/bin/gcc
-OBJCOPY= /usr/bin/gobjcopy
+OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
 AS_FLAGS=--32
 ASFLAGS=-m32
 AS_CPPFLAGS=
diff --git a/usr/src/boot/sys/boot/i386/loader/Makefile b/usr/src/boot/sys/boot/i386/loader/Makefile
index 9979faee99..768d7c8bab 100644
--- a/usr/src/boot/sys/boot/i386/loader/Makefile
+++ b/usr/src/boot/sys/boot/i386/loader/Makefile
@@ -34,7 +34,7 @@ LIBI386=        ../libi386/libi386.a
 #AWK=          /usr/xpg4/bin/awk
 LD=            /usr/bin/gld
 CC=            $(GCC_ROOT)/bin/gcc
-OBJCOPY=       /usr/bin/gobjcopy
+OBJCOPY=       $(GNU_ROOT)/bin/objcopy
 GSTRIP=                /usr/bin/gstrip
 ROOT_BOOT=     $(ROOT)/boot
 ROOT_BOOT_DEFAULTS=    $(ROOT)/boot/defaults
diff --git a/usr/src/boot/sys/boot/libstand/Makefile.com b/usr/src/boot/sys/boot/libstand/Makefile.com
index 8594b787fd..7b6959e581 100644
--- a/usr/src/boot/sys/boot/libstand/Makefile.com
+++ b/usr/src/boot/sys/boot/libstand/Makefile.com
@@ -17,7 +17,7 @@
 include $(SRC)/Makefile.master

 AS=    $(GNU_ROOT)/bin/gas
-LD=    $(GNU_ROOT)/bin/gld
+LD=    /usr/bin/gld
 CC=    $(GCC_ROOT)/bin/gcc

 LIBRARY=       libstand.a

History

#1

Updated by Igor Kozhukhov over 2 years ago

  • Assignee set to Toomas Soome

Also available in: Atom PDF