Skip to content

Commit 7381c9c

Browse files
[test] pass Mnobackslash explicitly to the tests that assume default is Mnobackslash (#1440)
This commit is to fix issue#1028 - Make backslash behaviour compatible with gfortran
1 parent 4b843fe commit 7381c9c

File tree

11 files changed

+13
-10
lines changed

11 files changed

+13
-10
lines changed

runtime/flang/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ else ()
1414
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -no-flang-libs")
1515
endif ()
1616

17+
# iso_c_bind.F95 has C backslash characters and require -Mnobackslash option
18+
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mnobackslash")
19+
1720
# We are using Fortran driver to build this library with fresh compiler
1821
# components, so point its binary directory to the build directory to pick up
1922
# flang* executables

test/f90_correct/inc/ae00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/ae00.f
1414
-$(RM) ae00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/ae00.f -o ae00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/ae00.f -o ae00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) ae00.$(OBJX) check.$(OBJX) $(LIBS) -o ae00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/db00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/db00.f
1414
-$(RM) db00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/db00.f -o db00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/db00.f -o db00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) db00.$(OBJX) check.$(OBJX) $(LIBS) -o db00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/dd00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/dd00.f
1414
-$(RM) dd00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/dd00.f -o dd00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/dd00.f -o dd00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) dd00.$(OBJX) check.$(OBJX) $(LIBS) -o dd00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/de00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/de00.f
1414
-$(RM) de00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/de00.f -o de00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/de00.f -o de00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) de00.$(OBJX) check.$(OBJX) $(LIBS) -o de00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/ec00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/ec00.f
1414
-$(RM) ec00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/ec00.f -o ec00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/ec00.f -o ec00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) ec00.$(OBJX) check.$(OBJX) $(LIBS) -o ec00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/fe86.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fe86.$(OBJX): $(SRC)/fe86.f90
1414
-$(RM) fe86.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/fe86.f90 -o fe86.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/fe86.f90 -o fe86.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) fe86.$(OBJX) check.$(OBJX) $(LIBS) -o fe86.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/ia00.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/ia00.f
1414
-$(RM) ia00.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/ia00.f -o ia00.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/ia00.f -o ia00.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) ia00.$(OBJX) check.$(OBJX) $(LIBS) -o ia00.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/im20.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/im20.f
1414
-$(RM) im20.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/im20.f -o im20.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/im20.f -o im20.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) im20.$(OBJX) check.$(OBJX) $(LIBS) -o im20.$(EXESUFFIX)
1919

2020

test/f90_correct/inc/ph10.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: $(SRC)/ph10.f
1414
-$(RM) ph10.$(EXESUFFIX) core *.d *.mod FOR*.DAT FTN* ftn* fort.*
1515
@echo ------------------------------------ building test $@
1616
-$(CC) -c $(CFLAGS) $(SRC)/check.c -o check.$(OBJX)
17-
-$(FC) -c $(FFLAGS) $(LDFLAGS) $(SRC)/ph10.f -o ph10.$(OBJX)
17+
-$(FC) -c $(FFLAGS) -Mnobackslash $(LDFLAGS) $(SRC)/ph10.f -o ph10.$(OBJX)
1818
-$(FC) $(FFLAGS) $(LDFLAGS) ph10.$(OBJX) check.$(OBJX) $(LIBS) -o ph10.$(EXESUFFIX)
1919

2020

0 commit comments

Comments
 (0)