LLVM Minix changes
- import libcxx - reduce targets to the one when compiled as a tools Change-Id: Iabb8427f80ff8e89463559a28bcb8b4f2bdbc496
This commit is contained in:
@@ -110,8 +110,6 @@ KERN_AS= library
|
||||
LIBKERN= ${KERNLIB}
|
||||
.else
|
||||
|
||||
# When using gold linker, specify the linker script
|
||||
GOLDLINKERSCRIPT?= ${LDS_N}
|
||||
USE_BITCODE=no
|
||||
|
||||
# use MINIX minc
|
||||
|
||||
@@ -5,6 +5,9 @@ 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)
|
||||
AFLAGS.bootxx.S+= -Wa,--divide
|
||||
.endif
|
||||
|
||||
PIE_CFLAGS=
|
||||
PIE_LDFLAGS=
|
||||
@@ -70,11 +73,7 @@ CPPFLAGS+= -DEPIA_HACK
|
||||
CPUFLAGS= -march=i386 -mtune=i386
|
||||
.endif
|
||||
|
||||
.if defined(__MINIX)
|
||||
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes
|
||||
.else
|
||||
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
|
||||
.endif
|
||||
CPPFLAGS+= -nostdinc -D_STANDALONE
|
||||
CPPFLAGS+= -I$S
|
||||
|
||||
@@ -105,10 +104,6 @@ LIBI386= ${I386LIB}
|
||||
### find out what to use for libsa
|
||||
SA_AS= library
|
||||
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
|
||||
.if defined(__MINIX)
|
||||
SAMISCMAKEFLAGS+="SA_INCLUDE_NET=no"
|
||||
AFLAGS+= -Wa,--divide
|
||||
.endif
|
||||
.include "${S}/lib/libsa/Makefile.inc"
|
||||
LIBSA= ${SALIB}
|
||||
|
||||
@@ -119,8 +114,8 @@ KERN_AS= library
|
||||
LIBKERN= ${KERNLIB}
|
||||
.else
|
||||
|
||||
# When using gold linker, specify the linker script
|
||||
GOLDLINKERSCRIPT?= ${LDS_N}
|
||||
SAMISCMAKEFLAGS+="SA_INCLUDE_NET=no"
|
||||
|
||||
USE_BITCODE=no
|
||||
|
||||
# use MINIX minc
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
S= ${.CURDIR}/../../../..
|
||||
|
||||
AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
|
||||
.if defined(__MINIX)
|
||||
AFLAGS.cdboot.S+= -Wa,--divide
|
||||
.endif # defined(__MINIX)
|
||||
|
||||
PIE_CFLAGS=
|
||||
PIE_LDFLAGS=
|
||||
@@ -11,10 +14,6 @@ PIE_AFLAGS=
|
||||
NOMAN= # defined
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if defined(__MINIX)
|
||||
AFLAGS+= -Wa,--divide
|
||||
.endif # defined(__MINIX)
|
||||
|
||||
STRIPFLAG= # nothing
|
||||
|
||||
LIBCRT0= # nothing
|
||||
|
||||
@@ -26,16 +26,6 @@ BINMODE= 444
|
||||
|
||||
LDFLAGS+= -nostdlib -Wl,-e,start
|
||||
CPPFLAGS+= -I. -I${.CURDIR}/../../lib -I${S}
|
||||
.if defined(__MINIX)
|
||||
CPPFLAGS+= -DLOADADDR=${LOADADDR}
|
||||
AFLAGS+= -Wa,--divide
|
||||
|
||||
BUILDSYMLINKS+= \
|
||||
${NETBSDSRCDIR}/include/arch/i386/include/stackframe.h machine/stackframe.h \
|
||||
${NETBSDSRCDIR}/include/arch/i386/include/fpu.h machine/fpu.h
|
||||
|
||||
DPSRCS+= machine/stackframe.h machine/fpu.h
|
||||
.endif # defined(__MINIX)
|
||||
|
||||
.if ${MACHINE_ARCH} == "x86_64"
|
||||
LDFLAGS+= -Wl,-m,elf_i386
|
||||
@@ -54,6 +44,17 @@ LOADADDR= 0x8800
|
||||
AFLAGS.mbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
|
||||
AFLAGS.gpt.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
|
||||
|
||||
.if defined(__MINIX)
|
||||
CPPFLAGS+= -DLOADADDR=${LOADADDR}
|
||||
AFLAGS.mbr.S+= -Wa,--divide
|
||||
|
||||
BUILDSYMLINKS+= \
|
||||
${NETBSDSRCDIR}/include/arch/i386/include/stackframe.h machine/stackframe.h \
|
||||
${NETBSDSRCDIR}/include/arch/i386/include/fpu.h machine/fpu.h
|
||||
|
||||
DPSRCS+= machine/stackframe.h machine/fpu.h
|
||||
.endif # defined(__MINIX)
|
||||
|
||||
${PROG}: ${OBJS}
|
||||
${_MKTARGET_LINK}
|
||||
.if defined(__MINIX)
|
||||
|
||||
@@ -5,6 +5,10 @@ SRCS= gptmbr.S
|
||||
|
||||
AFLAGS.gptmbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
|
||||
|
||||
.if defined(__MINIX)
|
||||
AFLAGS.gptmbr.S+= -Wa,--divide
|
||||
.endif # defined(__MINIX)
|
||||
|
||||
.include <../Makefile.mbr>
|
||||
|
||||
LOADADDR= 0x600
|
||||
|
||||
Reference in New Issue
Block a user