oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[boot-i386] Reduce differences with NetBSD

Browse Source 
Change-Id: I50c183d283858a098f0766cf3053fa6e78ce06ad
This commit is contained in:
Antoine Leca 2016-09-02 20:28:47 +02:00 committed by Lionel Sambuc
parent 7a3aae8b5b
commit 2aa07764b8
6 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/i386/include/signal.h
View File

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

5
sys/arch/i386/stand/boot/biosboot/Makefile
View File

@ -1,6 +1,11 @@
# $NetBSD: Makefile,v 1.3 2005/12/11 12:17:48 christos Exp $ # $NetBSD: Makefile,v 1.3 2005/12/11 12:17:48 christos Exp $
# LSC FIXME: Why change the name? # 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 PROG= boot_monitor
.include <../Makefile.boot> .include <../Makefile.boot>

4
sys/arch/i386/stand/bootxx/Makefile.bootxx
View File

@ -5,10 +5,6 @@ S= ${.CURDIR}/../../../../..
AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
AFLAGS.label.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:} 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_CFLAGS=
PIE_LDFLAGS= PIE_LDFLAGS=

3
sys/arch/i386/stand/cdboot/Makefile
View File

@ -4,9 +4,6 @@ S= ${.CURDIR}/../../../..
AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
.if defined(__MINIX) .if defined(__MINIX)
# LSC: Still required by our old binutils
AFLAGS.cdboot.S+= -Wa,--divide
USE_BITCODE=no USE_BITCODE=no
.endif # defined(__MINIX) .endif # defined(__MINIX)

9
sys/arch/i386/stand/mbr/Makefile.mbr
View File

@ -51,15 +51,6 @@ AFLAGS.gpt.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
.if defined(__MINIX) .if defined(__MINIX)
CPPFLAGS+= -DLOADADDR=${LOADADDR} 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) .endif # defined(__MINIX)
${PROG}: ${OBJS} ${PROG}: ${OBJS}

4
sys/arch/i386/stand/mbr/gptmbr/Makefile
View File

@ -4,10 +4,6 @@ PROG= gptmbr.bin
SRCS= gptmbr.S SRCS= gptmbr.S
AFLAGS.gptmbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 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> .include <../Makefile.mbr>