Resolve merge conflicts from downstream

amd · Jul 28, 2023 · 741fb69 · 741fb69
2 parents 73f784f + 6d82d17
commit 741fb69
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -794,7 +794,12 @@ file(MAKE_DIRECTORY ${BASE_INC_PATH})
 set (BLIS1_TARGET_PATH "${CMAKE_SOURCE_DIR}/${BASE_INC_PATH}/blis1.h")
 set (BLIS1__H_SRC_PATH "${CMAKE_SOURCE_DIR}/src/base/flamec/blis/include/blis1.h" )
 set (BLIS_FLATTEN_HEADER "${CMAKE_SOURCE_DIR}/build/flatten-headers.py")
-set (PYTHON_EXE "python")
+
+if(WIN32)
+	set (PYTHON_EXE "python")
+else()
+	set (PYTHON_EXE "python3")
+endif()
 
 execute_process(
     COMMAND ${PYTHON_EXE} ${BLIS_FLATTEN_HEADER} "${C_COMMENT}" "${VERBOSE}"

diff --git a/build/flatten-headers.py b/build/flatten-headers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like

diff --git a/configure b/configure
@@ -6158,7 +6158,7 @@ $as_echo_n "checking for (guessing) appropriate ${CC_VENDOR} language flags... "
 			fla_c_lang_flags='-std=c99 -Wall -Wno-unused-function -Wno-error=implicit-function-declaration -Wno-parentheses -Wfatal-errors'
 		;;
 				clang)
-			fla_c_lang_flags='-Wall -Wno-unused-function -Wno-error=implicit-function-declaration -Wno-parentheses -Wfatal-errors'
+			fla_c_lang_flags='-Wall -Wno-unused-function -Wno-error=implicit-function-declaration -Wno-error=incompatible-function-pointer-types -Wno-parentheses -Wfatal-errors'
 		;;
 				icc)
 			fla_c_lang_flags='-std=c99'

diff --git a/src/aocl_dtl/etrace_decoder.py b/src/aocl_dtl/etrace_decoder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 """
 

diff --git a/src/map/lapack2flamec/f2c/c/clarrv.c b/src/map/lapack2flamec/f2c/c/clarrv.c
@@ -1227,4 +1227,4 @@ int clarrv_(integer *n, real *vl, real *vu, real *d__, real * l, real *pivmin, i
     return 0;
     /* End of CLARRV */
 }
-/* clarrv_ */
+/* clarrv_ */
diff --git a/src/map/lapack2flamec/f2c/c/dlarrv.c b/src/map/lapack2flamec/f2c/c/dlarrv.c
@@ -1169,4 +1169,4 @@ int dlarrv_(integer *n, doublereal *vl, doublereal *vu, doublereal *d__, doubler
     return 0;
     /* End of DLARRV */
 }
-/* dlarrv_ */
+/* dlarrv_ */
diff --git a/src/map/lapack2flamec/f2c/c/slarrv.c b/src/map/lapack2flamec/f2c/c/slarrv.c
@@ -1164,4 +1164,4 @@ int slarrv_(integer *n, real *vl, real *vu, real *d__, real * l, real *pivmin, i
     return 0;
     /* End of SLARRV */
 }
-/* slarrv_ */
+/* slarrv_ */
diff --git a/src/map/lapack2flamec/f2c/c/zlarrv.c b/src/map/lapack2flamec/f2c/c/zlarrv.c
@@ -1220,4 +1220,4 @@ int zlarrv_(integer *n, doublereal *vl, doublereal *vu, doublereal *d__, doubler
     return 0;
     /* End of ZLARRV */
 }
-/* zlarrv_ */
+/* zlarrv_ */