summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-01-26 18:33:54 +0000
committerphk <phk@FreeBSD.org>2003-01-26 18:33:54 +0000
commit8825e48f4a0ba89c98456cb147172bcc1c4f19cd (patch)
tree60f71492035811a65bb9f438a94858613364ff2f
parent376bd949e066a9aef4b2331a6b8e66e5eba8132f (diff)
downloadFreeBSD-src-8825e48f4a0ba89c98456cb147172bcc1c4f19cd.zip
FreeBSD-src-8825e48f4a0ba89c98456cb147172bcc1c4f19cd.tar.gz
IA64 still needs to be able to run on MBR+BSD combination, so put disklabel
back. Pointed out by: peter
-rw-r--r--sbin/Makefile1
-rw-r--r--sbin/bsdlabel/bsdlabel.c1
-rw-r--r--sbin/disklabel/disklabel.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/sbin/Makefile b/sbin/Makefile
index 9268144..aa6fb02 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -100,6 +100,7 @@ SUBDIR+=fdisk
.if ${MACHINE_ARCH} == "ia64"
SUBDIR+=fdisk \
+ disklabel \
gpt \
mca
.endif
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index b9a8eaa..d01f0ea 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -106,6 +106,7 @@ __FBSDID("$FreeBSD$");
#if defined(__i386__)
#elif defined(__alpha__)
+#elif defined(__ia64__)
#else
#error I do not know about this architecture, and shall probably not be compiled for it.
#endif
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index b9a8eaa..d01f0ea 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -106,6 +106,7 @@ __FBSDID("$FreeBSD$");
#if defined(__i386__)
#elif defined(__alpha__)
+#elif defined(__ia64__)
#else
#error I do not know about this architecture, and shall probably not be compiled for it.
#endif
OpenPOWER on IntegriCloud