From 1b708c8a90e3548c4954c6367a9376f76f3746bd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 1 Jun 2018 06:29:10 +0000
Subject: user/mac-fdisk: hammer ARM support in

---
 user/mac-fdisk/mac-fdisk-amd64.patch | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'user/mac-fdisk/mac-fdisk-amd64.patch')

diff --git a/user/mac-fdisk/mac-fdisk-amd64.patch b/user/mac-fdisk/mac-fdisk-amd64.patch
index 8658ba9a6..236b037d9 100644
--- a/user/mac-fdisk/mac-fdisk-amd64.patch
+++ b/user/mac-fdisk/mac-fdisk-amd64.patch
@@ -9,15 +9,6 @@
  static int bsd_translate_fstype (int linux_type);
  static void bsd_link_part (void);
  #endif
-@@ -82,7 +82,7 @@
- 
- static struct disklabel bsd_dlabel;
- static char buffer[BSD_BBSIZE];
--#if defined (i386)
-+#if defined (i386) || defined (__amd64)
- static struct partition *bsd_part;
- static int bsd_part_index;
- #endif
 @@ -99,13 +99,13 @@
  	"   n   add a new BSD partition\n"
  	"   p   print BSD partition table\n"
@@ -88,15 +79,6 @@
    fprintf (stderr, "%s%d contains no disklabel.\n",
  	   disk_device, bsd_part_index+1);
  #elif defined (__alpha__) || defined (__powerpc__)
-@@ -376,7 +376,7 @@
-   while (1)
-     if ((c = tolower (read_char ("Do you want to create a disklabel? (y/n) "))) == 'y')
-     {
--#if defined (i386)
-+#if defined (i386) || defined(__amd64)
-       if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1)
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__)
-       if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1)
 @@ -507,7 +507,7 @@
  
    bcopy (&dl, d, sizeof (struct disklabel));
@@ -160,17 +142,6 @@
  static int
  bsd_translate_fstype (int linux_type)
  {
---- a/fdisklabel.h
-+++ b/fdisklabel.h
-@@ -35,7 +35,7 @@
- #define	BSD_MAXPARTITIONS 8
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
- 
--#if defined (i386)
-+#if defined (i386) || defined(__amd64)
- #define BSD_LABELSECTOR   1
- #define BSD_LABELOFFSET   0
- #define	BSD_BBSIZE        8192		/* size of boot area, with label */
 --- a/kernel-defs.h
 +++ b/kernel-defs.h
 @@ -15,8 +15,14 @@
-- 
cgit v1.2.3-60-g2f50