From 625cfd87d9282c9698a02cd6acd870ee0baee407 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 31 Jan 2011 05:55:52 +0100 Subject: [PATCH] fdisk_osf: simplify ifdef (incidentally, adds support for Microblaze) Signed-off-by: Denys Vlasenko --- util-linux/fdisk_osf.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index 79be0cd0f..65e6bd7c4 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c @@ -43,19 +43,15 @@ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" -#if defined(i386) || defined(__sparc__) || defined(__arm__) \ - || defined(__m68k__) || defined(__mips__) || defined(__s390__) \ - || defined(__s390__) || defined(__s390x__) \ - || defined(__sh__) || defined(__x86_64__) || defined(__avr32__) \ - || defined(__nds32__) -# define BSD_LABELSECTOR 1 -# define BSD_LABELOFFSET 0 -#elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ +#if defined(__alpha__) \ + || defined(__powerpc__) \ + || defined(__ia64__) \ || defined(__hppa__) # define BSD_LABELSECTOR 0 # define BSD_LABELOFFSET 64 #else -# error unknown architecture +# define BSD_LABELSECTOR 1 +# define BSD_LABELOFFSET 0 #endif #define BSD_BBSIZE 8192 /* size of boot area, with label */ -- 2.25.1