svn commit: r365472 - in stable: 11/contrib/llvm-project/compiler-rt/lib/builtins 11/lib/libcompiler_rt 12/contrib/llvm-project/compiler-rt/lib/builtins 12/lib/libcompiler_rt

[Dimitry Andric]

Author: dim
Date: Tue Sep  8 20:28:39 2020
New Revision: 365472
URL: https://svnweb.freebsd.org/changeset/base/365472

Log:
  Revert r365471 as it is breaking with old gcc on various arches:
  
  MFC r364753:
  
  Add atomic and bswap functions to libcompiler_rt
  
  There have been several mentions on our mailing lists about missing
  atomic functions in our system libraries (e.g. __atomic_load_8 and
  friends), and recently I saw __bswapdi2 and __bswapsi2 mentioned too.
  
  To address this, add implementations for the functions from compiler-rt
  to the system compiler support libraries, e.g. libcompiler_rt.a and and
  libgcc_s.so.
  
  This also needs a small fixup in compiler-rt's atomic.c, to ensure that
  32-bit mips can build correctly.
  
  Bump __FreeBSD_version to make it easier for port maintainers to detect
  when these functions were added.
  
  PR:		230888
  Differential Revision: https://reviews.freebsd.org/D26159
  
  MFC r364782:
  
  After r364753, there should be no need to suppress -Watomic-alignment
  warnings anymore for compiler-rt's atomic.c. This occurred because the
  IS_LOCK_FREE_8 macro was not correctly defined to 0 for mips, and this
  caused the compiler to emit a runtime call to __atomic_is_lock_free(),
  and that triggers the warning.

Modified:
  stable/11/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c
  stable/11/lib/libcompiler_rt/Makefile.inc
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c
  stable/12/lib/libcompiler_rt/Makefile.inc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c
==============================================================================
--- stable/11/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c	Tue Sep  8 20:02:08 2020	(r365471)
+++ stable/11/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c	Tue Sep  8 20:28:39 2020	(r365472)
@@ -124,8 +124,8 @@ static __inline Lock *lock_for_pointer(void *ptr) {
 #define IS_LOCK_FREE_2 __c11_atomic_is_lock_free(2)
 #define IS_LOCK_FREE_4 __c11_atomic_is_lock_free(4)
 
-/// 32 bit MIPS and PowerPC don't support 8-byte lock_free atomics
-#if defined(__mips__) || (!defined(__powerpc64__) && defined(__powerpc__))
+/// 32 bit PowerPC doesn't support 8-byte lock_free atomics
+#if !defined(__powerpc64__) && defined(__powerpc__)
 #define IS_LOCK_FREE_8 0
 #else
 #define IS_LOCK_FREE_8 __c11_atomic_is_lock_free(8)

Modified: stable/11/lib/libcompiler_rt/Makefile.inc
==============================================================================
--- stable/11/lib/libcompiler_rt/Makefile.inc	Tue Sep  8 20:02:08 2020	(r365471)
+++ stable/11/lib/libcompiler_rt/Makefile.inc	Tue Sep  8 20:28:39 2020	(r365472)
@@ -18,9 +18,6 @@ SRCF+=		ashldi3
 SRCF+=		ashlti3
 SRCF+=		ashrdi3
 SRCF+=		ashrti3
-SRCF+=		atomic
-SRCF+=		bswapdi2
-SRCF+=		bswapsi2
 SRCF+=		clear_cache
 SRCF+=		clzdi2
 SRCF+=		clzsi2
@@ -218,6 +215,12 @@ CFLAGS+=	-DEMIT_SYNC_ATOMICS
 SRCF+=		stdatomic
 .endif
 
+.if "${COMPILER_TYPE}" == "clang" && \
+    (${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe")
+SRCS+=          atomic.c
+CFLAGS.atomic.c+=      -Wno-atomic-alignment
+.endif
+
 .for file in ${SRCF}
 .if ${MACHINE_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") \
     && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
@@ -239,9 +242,18 @@ SRCS+=		aeabi_memmove.S
 SRCS+=		aeabi_memset.S
 SRCS+=		aeabi_uidivmod.S
 SRCS+=		aeabi_uldivmod.S
+SRCS+=		bswapdi2.S
+SRCS+=		bswapsi2.S
 SRCS+=		switch16.S
 SRCS+=		switch32.S
 SRCS+=		switch8.S
 SRCS+=		switchu8.S
 SRCS+=		sync_synchronize.S
 .endif
+
+# GCC-6.3 on mips32 requires bswap32 built-in.
+.if ${MACHINE_CPUARCH} == "mips"
+SRCS+=		bswapdi2.c
+SRCS+=		bswapsi2.c
+.endif
+