From f3c42b3ed81d2c1659722db996969868455392ab Mon Sep 17 00:00:00 2001 From: Antoine Leca Date: Fri, 15 Jul 2016 17:27:36 +0200 Subject: [PATCH 1/2] Adjust .gitignore for MINIX file system Some files in LLVM have more than Minix-maximum of 60 characters. Also drop some obsolete stuff, and add obj which are symlinks added to every directory when using /usr/obj as OBJDIR (hinted in wiki.) Change-Id: Iac82bb064f68689f247a2ee1b1d2f365344ab793 --- .gitignore | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c74ee06e8..b5ae5ebb9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ lib*.so* *.so.* *.d .depend -nbsdsrc/* TAGS tags GPATH @@ -25,10 +24,10 @@ GSYMS GTAGS \#*# CVS +obj !/.gitignore .gitignore .svn -minix-port.patch *.worldstone.log .worldstone* usr.bin/mdocml/man/*.7 @@ -39,5 +38,11 @@ releasetools/image releasetools/kernel releasetools/revision share/zoneinfo/builddir +external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-no-thu +external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-pure-v +external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-return +external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-this-a +external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-vdtors +external/bsd/llvm/dist/llvm/test/Verifier/bitcast-address-space-through-constant-inttoptr-inside-gep-i lib/libc/compat__* .gdbinit From 2cfb9f2c7279842af49e0b748df2961a6a6cf6c8 Mon Sep 17 00:00:00 2001 From: Antoine Leca Date: Fri, 2 Sep 2016 20:28:47 +0200 Subject: [PATCH 2/2] [boot-i386] Reduce differences with NetBSD Change-Id: I50c183d283858a098f0766cf3053fa6e78ce06ad --- sys/arch/i386/include/signal.h | 10 +++++----- sys/arch/i386/stand/boot/biosboot/Makefile | 5 +++++ sys/arch/i386/stand/bootxx/Makefile.bootxx | 4 ---- sys/arch/i386/stand/cdboot/Makefile | 3 --- sys/arch/i386/stand/mbr/Makefile.mbr | 9 --------- sys/arch/i386/stand/mbr/gptmbr/Makefile | 4 ---- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h index 1c6ac167d..086302b86 100644 --- a/sys/arch/i386/include/signal.h +++ b/sys/arch/i386/include/signal.h @@ -36,9 +36,9 @@ #include -#if defined(__minix) +#if defined(__minix) && (defined(_LIBMINC) || ! defined(_STANDALONE)) #include -#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 135d44c39..8a8cfce8d 100644 --- 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 ead067d64..8aa431701 100644 --- 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 9f1f503f3..2222458ac 100644 --- 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 1d1ee9068..79a8c4329 100644 --- 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 652db2ff5..7273c96f0 100644 --- 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>