svn commit: r351136 - head/stand/libsa

[Kyle Evans]

Author: kevans
Date: Fri Aug 16 20:09:20 2019
New Revision: 351136
URL: https://svnweb.freebsd.org/changeset/base/351136

Log:
  stand: gptboot: fix build with xtoolchain-llvm90
  
  ufsread.c grows a dependency on __ashldi3 with llvm90. For gptboot, just
  start pulling in ashldi3.c ashrdi3.c lshrdi3.c into libsa for all archs as
  the number of archs requiring one or more of them keeps growing. qdivrem.c
  and quad.h can be trivially kicked out of libsa if we start pulling these
  from compiler-rt as qdivrem was only used to implement umoddi3, divdi3,
  moddi3 (also in qdivrem.c).
  
  Reviewed by:	imp
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D21291

Deleted:
  head/stand/libsa/qdivrem.c
  head/stand/libsa/quad.h
Modified:
  head/stand/libsa/Makefile

Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile	Fri Aug 16 20:07:43 2019	(r351135)
+++ head/stand/libsa/Makefile	Fri Aug 16 20:09:20 2019	(r351136)
@@ -28,7 +28,7 @@ SRCS+= ntoh.c
 .PATH: ${LIBCSRC}/string
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c fls.c \
 	memccpy.c memchr.c memcmp.c memcpy.c memmove.c memset.c \
-	qdivrem.c strcat.c strchr.c strcmp.c strcpy.c stpcpy.c stpncpy.c \
+	strcat.c strchr.c strcmp.c strcpy.c stpcpy.c stpncpy.c \
 	strcspn.c strlcat.c strlcpy.c strlen.c strncat.c strncmp.c strncpy.c \
 	strnlen.c strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
 
@@ -53,14 +53,6 @@ CFLAGS.clang+=	-mno-movt
 .endif
 CFLAGS.clang+=	-mfpu=none
 
-# Compiler support functions
-.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/
-# __clzsi2 and ctzsi2 for various builtin functions
-SRCS+=	clzsi2.c ctzsi2.c
-# Divide and modulus functions called by the compiler
-SRCS+=	 divmoddi4.c  divmodsi4.c  divdi3.c  divsi3.c  moddi3.c  modsi3.c
-SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
-
 .PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm/
 SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
@@ -70,15 +62,17 @@ SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S a
 .PATH: ${LIBCSRC}/${MACHINE_CPUARCH}/gen
 .endif
 
-.if ${MACHINE_CPUARCH} == "powerpc"
-.PATH: ${LIBCSRC}/quad
+# Compiler support functions
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/
+# __clzsi2 and ctzsi2 for various builtin functions
+SRCS+=	clzsi2.c ctzsi2.c
+# Divide and modulus functions called by the compiler
+SRCS+=	divmoddi4.c  divmodsi4.c  divdi3.c  divsi3.c  moddi3.c  modsi3.c
+SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
 SRCS+=	ashldi3.c ashrdi3.c lshrdi3.c
-SRCS+=	syncicache.c
-.endif
 
-.if ${MACHINE_CPUARCH} == "mips"
-.PATH: ${LIBCSRC}/quad
-SRCS+=	ashldi3.c ashrdi3.c lshrdi3.c
+.if ${MACHINE_CPUARCH} == "powerpc"
+SRCS+=	syncicache.c
 .endif
 
 # uuid functions from libc