Fixing gcc-13 builds

benrichard-amd · Sep 26, 2023 · 9d38801 · 9d38801
1 parent 3c293ba
commit 9d38801
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 14 deletions.
diff --git a/Pragma_Examples/OpenACC/C/Make/reduction/Makefile b/Pragma_Examples/OpenACC/C/Make/reduction/Makefile
@@ -16,7 +16,11 @@ else
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENACC_FLAGS}
-LDFLAGS = ${OPENACC_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+   LDFLAGS = ${OPENACC_FLAGS} -fno-lto -lm
+else
+   LDFLAGS = ${OPENACC_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o codelet.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenACC/C/Make/saxpy/Makefile b/Pragma_Examples/OpenACC/C/Make/saxpy/Makefile
@@ -7,16 +7,22 @@ UNAMEP = $(shell uname -p)
 ROCM_CPUTARGET = $(UNAMEP)-pc-linux-gnu
 ROCM_GPUTARGET ?= amdgcn-amd-amdhsa
 
-ifeq ($(notdir $(CC)), clang)
+CC1=$(notdir $(CC))
+
+ifeq ($(findstring, clang, $(CC1)), clang)
   OPENACC_FLAGS = Clang_does_not_support_OpenACC_for_AMD_GPUs
-else ifeq ($(notdir $(CC)), amdclang)
+else ifeq ($(findstring, amdclang, $(CC1)), amdclang)
   OPENACC_FLAGS = amdclang_does_not_support_OpenACC_for_AMD_GPUs
 else
   OPENACC_FLAGS = -fopenacc -foffload=-march=${ROCM_GPU} -fopt-info-optimized-omp
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENACC_FLAGS}
-LDFLAGS = ${OPENACC_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+  LDFLAGS = ${OPENACC_FLAGS} -fno-lto -lm
+else
+  LDFLAGS = ${OPENACC_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o codelet.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenACC/C/Make/vecadd/Makefile b/Pragma_Examples/OpenACC/C/Make/vecadd/Makefile
@@ -7,16 +7,22 @@ UNAMEP = $(shell uname -p)
 ROCM_CPUTARGET = $(UNAMEP)-pc-linux-gnu
 ROCM_GPUTARGET ?= amdgcn-amd-amdhsa
 
-ifeq ($(notdir $(CC)), clang)
+CC1=$(notdir $(CC))
+
+ifeq ($(findstring, clang, $(CC1)), clang)
   OPENACC_FLAGS = Clang_does_not_support_OpenACC_for_AMD_GPUs
-else ifeq ($(notdir $(CC)), amdclang)
+else ifeq ($(findstring, amdclang, $(CC1)), amdclang)
   OPENACC_FLAGS = amdclang_does_not_support_OpenACC_for_AMD_GPUs
 else
   OPENACC_FLAGS = -fopenacc -foffload=-march=${ROCM_GPU} -fopt-info-optimized-omp
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENACC_FLAGS}
-LDFLAGS = ${OPENACC_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+  LDFLAGS = ${OPENACC_FLAGS} -fno-lto -lm
+else
+  LDFLAGS = ${OPENACC_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o timer.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenACC/Fortran/Make/freduce/Makefile b/Pragma_Examples/OpenACC/Fortran/Make/freduce/Makefile
@@ -16,7 +16,11 @@ else
 endif
 
 FFLAGS = -g -O3 ${FREE_FORM_FLAG} -fstrict-aliasing ${OPENACC_FLAGS}
-LDFLAGS = ${OPENACC_FLAGS}
+ifeq (${FC1},gfortran-13)
+   LDFLAGS = ${OPENACC_FLAGS} -fno-lto
+else
+   LDFLAGS = ${OPENACC_FLAGS}
+endif
 
 ${EXEC}: ${EXEC}.o
 	$(FC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenACC/Fortran/Make/vecadd/Makefile b/Pragma_Examples/OpenACC/Fortran/Make/vecadd/Makefile
@@ -16,7 +16,11 @@ else
 endif
 
 FFLAGS = -g -O3 ${FREE_FORM_FLAG} -fstrict-aliasing ${OPENACC_FLAGS}
-LDFLAGS = ${OPENACC_FLAGS}
+ifeq (${FC1},gfortran-13)
+   LDFLAGS = ${OPENACC_FLAGS} -fno-lto
+else
+   LDFLAGS = ${OPENACC_FLAGS}
+endif
 
 ftimers.o: timers.o
 vecadd.o: ftimers.o

diff --git a/Pragma_Examples/OpenMP/C/Make/reduction/Makefile b/Pragma_Examples/OpenMP/C/Make/reduction/Makefile
@@ -27,7 +27,11 @@ else
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENMP_FLAGS}
-LDFLAGS = ${OPENMP_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+   LDFLAGS = ${OPENMP_FLAGS} -fno-lto -lm
+else
+   LDFLAGS = ${OPENMP_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o codelet.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenMP/C/Make/saxpy/Makefile b/Pragma_Examples/OpenMP/C/Make/saxpy/Makefile
@@ -27,7 +27,11 @@ else
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENMP_FLAGS}
-LDFLAGS = ${OPENMP_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+   LDFLAGS = ${OPENMP_FLAGS} -fno-lto -lm
+else
+   LDFLAGS = ${OPENMP_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o codelet.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenMP/C/Make/vecadd/Makefile b/Pragma_Examples/OpenMP/C/Make/vecadd/Makefile
@@ -27,7 +27,11 @@ else
 endif
 
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENMP_FLAGS}
-LDFLAGS = ${OPENMP_FLAGS} -lm
+ifeq (${CC1},gcc-13)
+   LDFLAGS = ${OPENMP_FLAGS} -fno-lto -lm
+else
+   LDFLAGS = ${OPENMP_FLAGS} -lm
+endif
 
 ${EXEC}: ${EXEC}.o timer.o
 	$(CC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenMP/Fortran/Make/freduce/Makefile b/Pragma_Examples/OpenMP/Fortran/Make/freduce/Makefile
@@ -30,7 +30,11 @@ ifeq ($(notdir $(FC)), ftn)
 else
   FFLAGS = -g -O3 ${FREE_FORM_FLAG} -fstrict-aliasing ${OPENMP_FLAGS}
 endif
-LDFLAGS = ${OPENMP_FLAGS}
+ifeq (${FC1},gfortran-13)
+   LDFLAGS = ${OPENMP_FLAGS} -fno-lto
+else
+   LDFLAGS = ${OPENMP_FLAGS}
+endif
 
 ${EXEC}: ${EXEC}.o
 	$(FC) $(LDFLAGS) $^ -o $@

diff --git a/Pragma_Examples/OpenMP/Fortran/Make/vecadd/Makefile b/Pragma_Examples/OpenMP/Fortran/Make/vecadd/Makefile
@@ -30,7 +30,11 @@ else
   FFLAGS = -g -O3 ${FREE_FORM_FLAG} -fstrict-aliasing ${OPENMP_FLAGS}
 endif
 CFLAGS = -g -O3 -fstrict-aliasing ${OPENMP_FLAGS}
-LDFLAGS = ${OPENMP_FLAGS}
+ifeq (${FC1},gfortran-13)
+   LDFLAGS = ${OPENMP_FLAGS} -fno-lto
+else
+   LDFLAGS = ${OPENMP_FLAGS}
+endif
 
 ftimers.o: timers.o
 ${EXEC}.o: ftimers.o