summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-01-31 04:55:52 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-01-31 04:55:52 (GMT)
commit625cfd87d9282c9698a02cd6acd870ee0baee407 (patch)
treeba4542677bf6789d7c76afd08d9921d226ced5aa
parentb5233f8556d330ae866b903f64a5f14535e4b171 (diff)
downloadbusybox-625cfd87d9282c9698a02cd6acd870ee0baee407.tar.gz
busybox-625cfd87d9282c9698a02cd6acd870ee0baee407.tar.bz2
fdisk_osf: simplify ifdef (incidentally, adds support for Microblaze)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/fdisk_osf.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 79be0cd..65e6bd7 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 */