[boot-i386] Reduce differences with NetBSD

Change-Id: I50c183d283858a098f0766cf3053fa6e78ce06ad

diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h
index 1c6ac167d772537304c74a46c5eba62a560041a8..086302b86f5b80be391bb639a73036a44fe88ada 100644 (file)
--- a/sys/arch/i386/include/signal.h
+++ b/sys/arch/i386/include/signal.h
@@ -36,9 +36,9 @@
 
 #include <sys/featuretest.h>
 
-#if defined(__minix)
+#if defined(__minix) && (defined(_LIBMINC) || ! defined(_STANDALONE))
 #include <machine/fpu.h>
-#endif /* defined(__minix) */
+#endif /* defined(__minix) ... */
 
 typedef int sig_atomic_t;
 
@@ -108,17 +108,17 @@ struct sigcontext {
        int     sc_err;
 
        sigset_t sc_mask;               /* signal mask to restore (new style) */
-#if defined(__minix)
+#if defined(__minix) && (defined(_LIBMINC) || ! defined(_STANDALONE))
        union fpu_state_u sc_fpu_state;
        int trap_style;         /* KTS_* method of entering kernel */
        int sc_flags;                   /* MF_FPU_INITIALIZED if fpu state valid */
 #define SC_MAGIC 0xc0ffee1
        int sc_magic;
-#endif /* defined(__minix) */
+#endif /* defined(__minix) ... */
 };
 #endif /* _KERNEL */
 
-#if defined(__minix)
+#if defined(__minix) && (defined(_LIBMINC) || ! defined(_STANDALONE))
 __BEGIN_DECLS
 int sigreturn(struct sigcontext *_scp);
 __END_DECLS

diff --git a/sys/arch/i386/stand/boot/biosboot/Makefile b/sys/arch/i386/stand/boot/biosboot/Makefile
index 135d44c39f14714bf47ca8987f1c5c4fb26f99f7..8a8cfce8dac73e6e10e2d48b50ecfe57edbd0338 100644 (file)
--- a/sys/arch/i386/stand/boot/biosboot/Makefile
+++ b/sys/arch/i386/stand/boot/biosboot/Makefile
@@ -1,6 +1,11 @@
 # $NetBSD: Makefile,v 1.3 2005/12/11 12:17:48 christos Exp $
 
 # LSC FIXME: Why change the name?
+# AL: name is changed because in MINIX 3 system is stored
+# in /boot/ directory, so names are conflicting. This in turn
+# is probably inspired by Linux habits to have /boot as a
+# separate partition, holding the system at boot time.
+# Clearly a name change to align with NetBSD is possible!
 PROG=  boot_monitor
 
 .include <../Makefile.boot>

diff --git a/sys/arch/i386/stand/bootxx/Makefile.bootxx b/sys/arch/i386/stand/bootxx/Makefile.bootxx
index ead067d6424b09f7d012c46ebc15b1d6a4fd72c6..8aa4317011c6363b1c287c75abc811f2d6cdc192 100644 (file)
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx
@@ -5,10 +5,6 @@ S=     ${.CURDIR}/../../../../..
 AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.label.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.pbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-.if defined(__MINIX)
-# LSC: Still required by our old binutils
-AFLAGS.bootxx.S+= -Wa,--divide
-.endif # defined(__MINIX)
 
 PIE_CFLAGS=
 PIE_LDFLAGS=

diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index 9f1f503f3d583bd739923b7f03608c49d2c8a4ee..2222458ac8f6ffec39d0b177aedcde28b67b0fe5 100644 (file)
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -4,9 +4,6 @@ S=              ${.CURDIR}/../../../..
 
 AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 .if defined(__MINIX)
-# LSC: Still required by our old binutils
-AFLAGS.cdboot.S+= -Wa,--divide
-
 USE_BITCODE=no
 .endif # defined(__MINIX)
 

diff --git a/sys/arch/i386/stand/mbr/Makefile.mbr b/sys/arch/i386/stand/mbr/Makefile.mbr
index 1d1ee9068001680996e42e7a8018b099c96748f4..79a8c4329cb398cd319beb13183dec7483fdabc7 100644 (file)
--- a/sys/arch/i386/stand/mbr/Makefile.mbr
+++ b/sys/arch/i386/stand/mbr/Makefile.mbr
@@ -51,15 +51,6 @@ AFLAGS.gpt.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 
 .if defined(__MINIX)
 CPPFLAGS+= -DLOADADDR=${LOADADDR}
-
-# LSC: Still required by our old binutils
-AFLAGS.mbr.S+= -Wa,--divide
-
-BUILDSYMLINKS+= \
-       ${NETBSDSRCDIR}/minix/include/arch/i386/include/stackframe.h machine/stackframe.h \
-       ${NETBSDSRCDIR}/minix/include/arch/i386/include/fpu.h machine/fpu.h
-
-DPSRCS+= machine/stackframe.h  machine/fpu.h
 .endif # defined(__MINIX)
 
 ${PROG}: ${OBJS}

diff --git a/sys/arch/i386/stand/mbr/gptmbr/Makefile b/sys/arch/i386/stand/mbr/gptmbr/Makefile
index 652db2ff5b72868b963aa966635bf7e3694d14ad..7273c96f0336b02de95f2f36960b1909016c457b 100644 (file)
--- a/sys/arch/i386/stand/mbr/gptmbr/Makefile
+++ b/sys/arch/i386/stand/mbr/gptmbr/Makefile
@@ -4,10 +4,6 @@ PROG=          gptmbr.bin
 SRCS=          gptmbr.S
 
 AFLAGS.gptmbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-.if defined(__MINIX)
-# LSC: Still required by our old binutils
-AFLAGS.gptmbr.S+= -Wa,--divide
-.endif # defined(__MINIX)
 
 .include <../Makefile.mbr>