From a443a169067a0eaa714460cdadee2f09d22bc299 Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 21 Dec 2012 15:15:35 +0000
Subject: [PATCH] Move the 64-bit _setjmp to lib/libstand.

---
 {sys/boot/userboot => lib}/libstand/amd64/_setjmp.S | 0
 sys/boot/userboot/libstand/Makefile                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {sys/boot/userboot => lib}/libstand/amd64/_setjmp.S (100%)

diff --git a/sys/boot/userboot/libstand/amd64/_setjmp.S b/lib/libstand/amd64/_setjmp.S
similarity index 100%
rename from sys/boot/userboot/libstand/amd64/_setjmp.S
rename to lib/libstand/amd64/_setjmp.S
diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile
index fa54b016450d..49c6bfbd5436 100644
--- a/sys/boot/userboot/libstand/Makefile
+++ b/sys/boot/userboot/libstand/Makefile
@@ -94,7 +94,7 @@ SRCS+= uuid_equal.c uuid_is_nil.c
 
 # _setjmp/_longjmp
 .if ${MACHINE_CPUARCH} == "amd64"
-.PATH: ${.CURDIR}/amd64
+.PATH: ${S}/amd64
 .elif ${MACHINE_ARCH} == "powerpc64"
 .PATH: ${S}/powerpc
 .else