sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-17 04:05:06 +00:00
parent 02776f1507
commit a0fe1892c0
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
885 changed files with 6817 additions and 4874 deletions

View file

@ -1,7 +1,7 @@
Index: SConscript
--- SConscript.orig
+++ SConscript
@@ -650,7 +650,7 @@ else:
@@ -700,7 +700,7 @@ else:
elif 'sve' in env['arch']:
lib_files += lib_files_sve
@ -10,7 +10,7 @@ Index: SConscript
Export('arm_compute_a')
@@ -669,7 +669,7 @@ if env['os'] == 'macos':
@@ -719,7 +719,7 @@ if env['os'] == 'macos':
# macos static library archiver fails if given an empty list of files
arm_compute_core_a = build_library('arm_compute_core-static', arm_compute_env, lib_files, static=True)
else:
@ -19,12 +19,12 @@ Index: SConscript
Export('arm_compute_core_a')
@@ -682,7 +682,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
@@ -732,7 +732,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
# Build graph libraries
arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', '-Wno-pessimizing-move'])
-arm_compute_graph_a = build_library('arm_compute_graph-static', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a ])
+arm_compute_graph_a = build_library('arm_compute_graph', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a ])
-arm_compute_graph_a = build_library('arm_compute_graph-static', arm_compute_graph_env, graph_files, static=True)
+arm_compute_graph_a = build_library('arm_compute_graph', arm_compute_graph_env, graph_files, static=True)
Export('arm_compute_graph_a')
if env['os'] != 'bare_metal' and not env['standalone']:

View file

@ -1,7 +1,7 @@
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
@@ -253,17 +253,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
@@ -258,17 +258,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not in c_compiler ):
print( "WARNING: Only clang is officially supported to build the Compute Library for Android")
@ -20,7 +20,7 @@ Index: SConstruct
if env['cppthreads']:
env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)])
@@ -424,25 +415,6 @@ if not GetOption("help"):
@@ -474,25 +465,6 @@ if not GetOption("help"):
except OSError:
print("ERROR: Compiler '%s' not found" % env['CXX'])
Exit(1)