From owner-p4-projects  Thu Mar 28 20: 4:30 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2D6C337B41A; Thu, 28 Mar 2002 20:04:16 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8197637B41A
	for <perforce@freebsd.org>; Thu, 28 Mar 2002 20:04:14 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2T44EG90626
	for perforce@freebsd.org; Thu, 28 Mar 2002 20:04:14 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 28 Mar 2002 20:04:14 -0800 (PST)
Message-Id: <200203290404.g2T44EG90626@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 8602 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8602

Change 8602 by peter@peter_thunder on 2002/03/28 20:03:55

	update for native builds and other hacks

Affected files ...

... //depot/projects/ia64/sys/boot/efi/loader/Makefile#3 edit
... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#5 edit

Differences ...

==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS+=		main.c conf.c dev_net.c
 
 # Enable BootForth
-BOOT_FORTH=	yes
+#BOOT_FORTH=	yes
 CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 .if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
@@ -37,7 +37,8 @@
 CFLAGS+= -DLOADER
 
 LDSCRIPT=	${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
-LDFLAGS=	-nostdlib -T ${LDSCRIPT} -shared -Bsymbolic -L/usr/local/ia64-unknown-linux/lib
+LDFLAGS=	-nostdlib -T ${LDSCRIPT} -shared -Bsymbolic -L/usr/lib
+OBJCOPY?=	objcopy
 
 CLEANFILES+=	setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \
 		vers.c vers.o ${BASE}.efi ${BASE}.sym ${BASE}.list
@@ -54,6 +55,7 @@
 
 ${BASE}.efi: ${BASE}.sym
 	${OBJCOPY} -j .text \
+		-j set_Xcommand_set \
 		-j .hash \
 		-j .data \
 		-j .sdata \
@@ -61,8 +63,6 @@
 		-j .rela \
 		-j .reloc \
 		-j .dynsym \
-		-j .dynstr \
-		-j set_Xcommand_set \
 		--target=efi-app-${MACHINE_ARCH} \
 		${BASE}.sym ${BASE}.efi
 

==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#5 (text+ko) ====

@@ -43,7 +43,7 @@
 CFLAGS+= -DLOADER
 CFLAGS+= -ffreestanding
 
-LDFLAGS=	-nostdlib -T ${.CURDIR}/ldscript.ia64
+LDFLAGS=	-L/usr/lib -T ${.CURDIR}/ldscript.ia64
 
 CLEANFILES+=	vers.c vers.o ${PROG}.list
 CLEANFILES+=	loader.help

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message