Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

CMakeLists.txt

@@ -465,7 +465,6 @@ endif()
 include(DaemonNacl)
 if (NACL)
     add_library(srclibs-nacl-module EXCLUDE_FROM_ALL ${NACLLIST_MODULE})
-    set_target_properties(srclibs-nacl-module PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
     set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-module)
 else()
     add_library(srclibs-nacl-native EXCLUDE_FROM_ALL ${NACLLIST_NATIVE})

cmake/DaemonFlags.cmake

@@ -363,14 +363,12 @@ else()
 	endif()
 
 	if (NACL AND USE_NACL_SAIGO AND SAIGO_ARCH STREQUAL "arm")
-		# This should be set for every build type because build type flags
-		# are set after the other custom flags and then have the last word.
-		# DEBUG should already use -O0 anyway.
+		# Saigo produces broken arm builds when optimizing them.
 		# See: https://github.com/Unvanquished/Unvanquished/issues/3297
-		set_c_cxx_flag("-O0" DEBUG)
-		set_c_cxx_flag("-O0" RELEASE)
-		set_c_cxx_flag("-O0" RELWITHDEBINFO)
-		set_c_cxx_flag("-O0" MINSIZEREL)
+		# When setting this clang-specific option, we don't have to care
+		# about the ordering of -O options that may be introduced,
+		# all -O options added to the command line are ignored.
+		set_c_cxx_flag("-Xclang -disable-llvm-passes")
 	endif()
 
 	# Extra debug flags.
@@ -476,7 +474,16 @@ else()
 		# Don't set _FORTIFY_SOURCE in debug builds.
 	endif()
 
-	try_c_cxx_flag(FPIC "-fPIC")
+	if (NOT NACL)
+		# Saigo reports weird errors when building some cgame and sgame arm nexe with PIC:
+		# > error: Cannot represent a difference across sections
+		# > error: expected relocatable expression
+		# Google-built Saigo crashes when building amd64 cgame with PIC:
+		# > UNREACHABLE executed at llvm/lib/Target/X86/X86ISelLowering.cpp
+		# Self-built Saigo doesn't crash, maybe because assertions are disabled.
+		# PIC is not useful with NaCl under any circumstances, so we don't use PIC with NaCl.
+		try_c_cxx_flag(FPIC "-fPIC")
+	endif()
 
 	if (USE_HARDENING)
 		# PNaCl accepts the flags but does not define __stack_chk_guard and __stack_chk_fail.
@@ -491,7 +498,7 @@ else()
 		try_c_cxx_flag(FNO_STRICT_OVERFLOW "-fno-strict-overflow")
 		try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")
 
-		if (NOT NACL OR (NACL AND GAME_PIE))
+		if (NOT NACL)
 			# The -pie flag requires -fPIC:
 			# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
 			# This flag isn't used on macOS:
@@ -693,6 +700,13 @@ if (APPLE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 endif()
 
+# Glibc-specific definitions
+if (LINUX)
+	# QUIRK: It does nothing when it is not needed on non-glibc Linux
+	# systems so it's harmless to always set it.
+	add_definitions(-D_FILE_OFFSET_BITS=64)
+endif()
+
 # Configuration specific definitions
 
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<${DEBUG_GENEXP_COND}:DEBUG_BUILD>)

cmake/DaemonPlatform.cmake

@@ -40,14 +40,5 @@ else()
   message( FATAL_ERROR "Platform not supported" )
 endif()
 
-if (NACL AND USE_NACL_SAIGO)
-	# Saigo clang reports weird errors when building some cgame and sgame arm nexe with PIE.
-	# Saigo clang crashes when building amd64 cgame with PIE, sgame builds properly though.
-	set(GAME_PIE 0)
-else()
-	set(GAME_PIE 1)
-endif()
-
-
 include(DaemonArchitecture)
 include(DaemonCompiler)

src/common/FileSystem.cpp

@@ -32,6 +32,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "minizip/unzip.h"
 #endif
 
+#if defined(__GLIBC__)
+#if !defined(_FILE_OFFSET_BITS) || (_FILE_OFFSET_BITS != 64)
+#error _FILE_OFFSET_BITS should be set to 64 on glibc
+#endif
+#endif
+
 #ifdef BUILD_VM
 #include "shared/VMMain.h"
 #else
@@ -175,6 +181,7 @@ enum class openMode_t {
 	MODE_APPEND,
 	MODE_EDIT
 };
+
 inline int my_open(Str::StringRef path, openMode_t mode)
 {
 	int mode_ = Util::ordinal(mode);
@@ -192,14 +199,10 @@ inline int my_open(Str::StringRef path, openMode_t mode)
 	int fd = _open_osfhandle(reinterpret_cast<intptr_t>(h), modes[mode_] | O_BINARY | O_NOINHERIT);
 	if (fd == -1)
 		CloseHandle(h);
-#elif defined(__FreeBSD__) || defined(__APPLE__)
-	// O_CLOEXEC is supported in macOS from 10.7 onwards
+#else
+	// This doesn't actually work in Native Client, but it's not used anyways.
+	// O_CLOEXEC is supported in macOS from 10.7 onwards.
 	int fd = open(path.c_str(), modes[mode_] | O_CLOEXEC, 0666);
-#elif defined(__linux__)
-	int fd = open64(path.c_str(), modes[mode_] | O_CLOEXEC | O_LARGEFILE, 0666);
-#elif defined(__native_client__)
-	// This doesn't actually work, but it's not used anyways
-	int fd = open(path.c_str(), modes[mode_], 0666);
 #endif
 
 #ifndef _WIN32
@@ -238,47 +241,37 @@ inline offset_t my_ftell(FILE* fd)
 {
 #ifdef _WIN32
 	return _ftelli64(fd);
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 	return ftello(fd);
-#elif defined(__linux__)
-	return ftello64(fd);
 #endif
 }
 inline int my_fseek(FILE* fd, offset_t off, int whence)
 {
 #ifdef _WIN32
 	return _fseeki64(fd, off, whence);
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 	return fseeko(fd, off, whence);
-#elif defined(__linux__)
-	return fseeko64(fd, off, whence);
 #endif
 }
 #ifdef _WIN32
 typedef struct _stati64 my_stat_t;
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 using my_stat_t = struct stat;
-#elif defined(__linux__)
-using my_stat_t = struct stat64;
 #endif
 inline int my_fstat(int fd, my_stat_t* st)
 {
 #ifdef _WIN32
 	return _fstati64(fd, st);
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 	return fstat(fd, st);
-#elif defined(__linux__)
-	return fstat64(fd, st);
 #endif
 }
 inline int my_stat(Str::StringRef path, my_stat_t* st)
 {
 #ifdef _WIN32
 	return _wstati64(Str::UTF8To16(path).c_str(), st);
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 	return stat(path.c_str(), st);
-#elif defined(__linux__)
-	return stat64(path.c_str(), st);
 #endif
 }
 inline intptr_t my_pread(int fd, void* buf, size_t count, offset_t offset)
@@ -294,10 +287,8 @@ inline intptr_t my_pread(int fd, void* buf, size_t count, offset_t offset)
 		return -1;
 	}
 	return bytesRead;
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__native_client__)
+#else
 	return pread(fd, buf, count, offset);
-#elif defined(__linux__)
-	return pread64(fd, buf, count, offset);
 #endif
 }