Fix arm build for GCC, noassert, -Os

Change-Id: I706fdfc8fc9a5e0c9076e3657ac1a6ef0745bd14

diff --git a/minix/kernel/arch/earm/Makefile.inc b/minix/kernel/arch/earm/Makefile.inc
index 18456d943e99cf44850ab1638c41f1af6b50ba5b..31b3af621dba638f8a392ba3ea7f94e33d9d908d 100644 (file)
--- a/minix/kernel/arch/earm/Makefile.inc
+++ b/minix/kernel/arch/earm/Makefile.inc
@@ -18,8 +18,8 @@ MINC_OBJS_UNPAGED= atoi.o \
        printf.o subr_prf.o \
        strcmp.o strcpy.o strlen.o strncmp.o \
        memcpy.o memmove.o memset.o 
-MINC_OBJS_UNPAGED+= divsi3.o udivsi3.o umodsi3.o \
-       umoddi3.o udivmoddi4.o aeabi_uidivmod.o \
+MINC_OBJS_UNPAGED+= divmodsi4.o divsi3.o udivsi3.o umodsi3.o \
+       umoddi3.o udivmoddi4.o aeabi_idivmod.o aeabi_uidivmod.o \
        udivmodsi4.o aeabi_uldivmod.o
 atoi.o:                ${NETBSDSRCDIR}/minix/lib/libminc/atoi.c
 printf.o:      ${NETBSDSRCDIR}/sys/lib/libsa/printf.c
@@ -36,7 +36,9 @@ udivsi3.o:    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/udivsi3.c
 umodsi3.o:     ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/umodsi3.c
 umoddi3.o:     ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/umoddi3.c
 udivmoddi4.o:  ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/udivmoddi4.c
+divmodsi4.o:           ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/arm/divmodsi4.S
 udivmodsi4.o:          ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/arm/udivmodsi4.S
+aeabi_idivmod.o:       ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/arm/aeabi_idivmod.S
 aeabi_uidivmod.o:      ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/arm/aeabi_uidivmod.S
 aeabi_uldivmod.o:      ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/arm/aeabi_uldivmod.S
 

diff --git a/minix/lib/libminc/arch/earm/Makefile.libc.inc b/minix/lib/libminc/arch/earm/Makefile.libc.inc
index 3d01bafbda1a5c8bfb9cbeaf04109baef777d4df..5295a0cc3f34bca6a72613c7cfcfa06c7f0cfce3 100644 (file)
--- a/minix/lib/libminc/arch/earm/Makefile.libc.inc
+++ b/minix/lib/libminc/arch/earm/Makefile.libc.inc
@@ -10,6 +10,13 @@ OBJS+=       ${f}
 CLEANFILES+= ${f}
 .endfor
 
+.for f in \
+       lshldi3.o
+${f}:  ${LIBCOMMONCDIR}/quad/${f:C/\.o/.c/}
+OBJS+= ${f}
+CLEANFILES+= ${f}
+.endfor
+
 .for f in \
        byte_swap_2.o byte_swap_4.o 
 ${f}:  ${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.S/}