Remove -gnat05, always use GNATFLAGS.

Fix #651

6 files changed, 13 insertions, 13 deletions

diff --git a/src/ortho/debug/Makefile b/src/ortho/debug/Makefile
index 3e8bb5913..1dd2d0f06 100644
--- a/src/ortho/debug/Makefile
+++ b/src/ortho/debug/Makefile
@@ -24,7 +24,7 @@ GNATMAKE=gnatmake
 CC=gcc
 CFLAGS=-g
 ALL_GNAT_FLAGS=-pipe -g -gnato -gnatwaeu -gnatf -gnaty3befhkmr
-GNATMAKE_FLAGS=-m $(ALL_GNAT_FLAGS) $(GNAT_FLAGS) -aI$(ortho_srcdir) -aI$(orthobe_srcdir) -aI.
+GNATMAKE_FLAGS=-m $(ALL_GNAT_FLAGS) $(GNATFLAGS) -aI$(ortho_srcdir) -aI$(orthobe_srcdir) -aI.
 #LARGS=-largs -static
 SED=sed
 
diff --git a/src/ortho/gcc/Makefile b/src/ortho/gcc/Makefile
index f81b609cc..5b12ea569 100644
--- a/src/ortho/gcc/Makefile
+++ b/src/ortho/gcc/Makefile
@@ -67,7 +67,7 @@ LIBS =  $(AGCC_GCCOBJ_DIR)/gcc/libcommon.a \
 
 $(ortho_exec): $(AGCC_DEPS) $(orthobe_srcdir)/ortho_gcc.ads force
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir) \
-	 -aI$(ortho_srcdir)/gcc $(GNAT_FLAGS) ortho_gcc-main \
+	 -aI$(ortho_srcdir)/gcc $(GNATFLAGS) ortho_gcc-main \
 	 -bargs -E -largs --LINK=$(LINKER) $(AGCC_OBJS) \
         $(BACKEND) $(LIBS) $(BACKENDLIBS)
 
diff --git a/src/ortho/llvm-nodebug/Makefile b/src/ortho/llvm-nodebug/Makefile
index 8cb7a9b6b..50ddc1bc5 100644
--- a/src/ortho/llvm-nodebug/Makefile
+++ b/src/ortho/llvm-nodebug/Makefile
@@ -1,5 +1,5 @@
 ortho_srcdir=..
-GNAT_FLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael -gnat05
+GNATFLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael
 CXX=clang++
 LLVM_CONFIG=llvm-config
 GNATMAKE=gnatmake
@@ -10,7 +10,7 @@ all: $(ortho_exec)
 
 $(ortho_exec): $(ortho_srcdir)/llvm-nodebug/ortho_llvm.ads force llvm-cbindings.o
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm-nodebug -aI$(ortho_srcdir) \
-	$(GNAT_FLAGS) ortho_code_main -bargs -E \
+	$(GNATFLAGS) ortho_code_main -bargs -E \
 	-largs llvm-cbindings.o --LINK=$(CXX) \
 	$(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs`
 
diff --git a/src/ortho/llvm/Makefile b/src/ortho/llvm/Makefile
index 8c6a8d7f2..e1940c7a3 100644
--- a/src/ortho/llvm/Makefile
+++ b/src/ortho/llvm/Makefile
@@ -1,5 +1,5 @@
 ortho_srcdir=..
-GNAT_FLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael -gnat05
+GNATFLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael
 CXX=clang++
 LLVM_CONFIG=llvm-config
 GNATMAKE=gnatmake
@@ -10,7 +10,7 @@ all: $(ortho_exec)
 
 $(ortho_exec): $(ortho_srcdir)/llvm/ortho_llvm.ads force llvm-cbindings.o
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm -aI$(ortho_srcdir) \
-	$(GNAT_FLAGS) ortho_code_main -bargs -E \
+	$(GNATFLAGS) ortho_code_main -bargs -E \
 	-largs llvm-cbindings.o --LINK=$(CXX) \
 	$(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs`
 
diff --git a/src/ortho/llvm4-nodebug/Makefile b/src/ortho/llvm4-nodebug/Makefile
index 3ba5e798b..3f02d75ef 100644
--- a/src/ortho/llvm4-nodebug/Makefile
+++ b/src/ortho/llvm4-nodebug/Makefile
@@ -1,5 +1,5 @@
 ortho_srcdir=..
-GNAT_FLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael -gnat05
+GNATFLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael
 CXX=clang++
 LLVM_CONFIG=llvm-config
 GNATMAKE=gnatmake
@@ -10,7 +10,7 @@ all: $(ortho_exec)
 
 $(ortho_exec): $(ortho_srcdir)/llvm4-nodebug/ortho_llvm.ads force llvm-cbindings.o
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm4-nodebug -aI$(ortho_srcdir) \
-	$(GNAT_FLAGS) ortho_code_main -bargs -E \
+	$(GNATFLAGS) ortho_code_main -bargs -E \
 	-largs llvm-cbindings.o --LINK=$(CXX) \
 	$(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs`
 
diff --git a/src/ortho/mcode/Makefile b/src/ortho/mcode/Makefile
index 572c13f42..284d155a4 100644
--- a/src/ortho/mcode/Makefile
+++ b/src/ortho/mcode/Makefile
@@ -1,6 +1,6 @@
 ortho_srcdir=..
 GNATMAKE=gnatmake
-GNAT_FLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwlcru -gnat05
+GNATFLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwlcru
 CC=gcc
 BE=mcode
 SED=sed
@@ -9,20 +9,20 @@ all: $(ortho_exec)
 
 $(ortho_exec): $(ortho_srcdir)/mcode/ortho_mcode.ads memsegs_c.o force
 	$(GNATMAKE) -o $@ -g -aI$(ortho_srcdir)/mcode -aI$(ortho_srcdir) \
-	-aI$(ortho_srcdir)/.. $(GNAT_FLAGS) -gnatw.A ortho_code_main \
+	-aI$(ortho_srcdir)/.. $(GNATFLAGS) -gnatw.A ortho_code_main \
 	-bargs -E -largs memsegs_c.o #-static
 
 memsegs_c.o: $(ortho_srcdir)/mcode/memsegs_c.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 oread: force
-	gnatmake -m -o $@ -g $(GNAT_FLAGS) -aI../oread ortho_code_main -aI.. -largs memsegs_c.o
+	$(GNATMAKE) -m -o $@ -g $(GNATFLAGS) -aI../oread ortho_code_main -aI.. -largs memsegs_c.o
 
 elfdump: force
-	gnatmake -m -g $(GNAT_FLAGS) $@
+	$(GNATMAKE) -m -g $(GNATFLAGS) $@
 
 coffdump: force
-	gnatmake -m $(GNAT_FLAGS) $@
+	$(GNATMAKE) -m $(GNATFLAGS) $@
 
 clean:
 	$(RM) -f *.o *.ali ortho_code_main elfdump