svn commit: r533716 - head/emulators/rpcs3

[Jan Beich]

Author: jbeich
Date: Sun May  3 00:22:47 2020
New Revision: 533716
URL: https://svnweb.freebsd.org/changeset/ports/533716

Log:
  emulators/rpcs3: unbreak on FreeBSD < 12.2 after r533715
  
  In file included from rpcs3/Emu/System.cpp:1:
  In file included from rpcs3/stdafx.h:25:
  rpcs3/util/atomic.hpp:370:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btsw %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:378:46: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btrw %2, %0\n": "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                             ^
  rpcs3/util/atomic.hpp:386:46: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btcw %2, %0\n": "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                             ^
  rpcs3/util/atomic.hpp:491:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btsl %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:498:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btrl %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:505:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btcl %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:611:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btsq %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:619:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btrq %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                              ^
  rpcs3/util/atomic.hpp:627:47: error: invalid output constraint '=@ccc' in asm
                  __asm__("lock btcq %2, %0\n" : "+m" (dest), "=@ccc" (result) : "Ir" (_bit) : "cc");
                                                              ^
  In file included from rpcs3/Emu/System.cpp:22:
  In file included from rpcs3/Emu/RSX/GSRender.h:3:
  In file included from rpcs3/Emu/RSX/RSXThread.h:10:
  In file included from rpcs3/Emu/RSX/rsx_cache.h:11:
  In file included from rpcs3/Emu/RSX/Common/texture_cache_checker.h:3:
  rpcs3/Emu/RSX/Common/../rsx_utils.h:895:22: error: comparison of integers of different signs: 'int' and 'u32' (aka 'unsigned int') [-Werror,-Wsign-compare]
                          for (int n = 0; n < initial_size; ++n)
                                          ~ ^ ~~~~~~~~~~~~

Modified:
  head/emulators/rpcs3/Makefile   (contents, props changed)

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Sun May  3 00:22:02 2020	(r533715)
+++ head/emulators/rpcs3/Makefile	Sun May  3 00:22:47 2020	(r533716)
@@ -45,6 +45,15 @@ CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS
 LDFLAGS+=	-Wl,--as-needed # GLU
 
+# XXX Drop after FreeBSD 11.3/12.1 EOL
+.if (exists(/usr/lib/clang/8.0.0) || exists(/usr/lib/clang/8.0.1)) && ${CXX} == c++
+BUILD_DEPENDS+=	clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+USES:=		${USES:Ncompiler*}
+CC=		clang${LLVM_DEFAULT}
+CXX=		clang++${LLVM_DEFAULT}
+CPP=		clang-cpp${LLVM_DEFAULT}
+.endif
+
 OPTIONS_DEFINE=	ALSA EVDEV FAUDIO PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN