aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in16
-rw-r--r--dist/gcc/Make-lang.in2
-rw-r--r--src/grt/Makefile.inc2
-rw-r--r--src/ortho/debug/Makefile2
-rw-r--r--src/ortho/gcc/Makefile2
-rw-r--r--src/ortho/llvm-nodebug/Makefile4
-rw-r--r--src/ortho/llvm/Makefile4
-rw-r--r--src/ortho/llvm4-nodebug/Makefile4
-rw-r--r--src/ortho/mcode/Makefile10
-rw-r--r--src/vhdl/translate/Makefile8
10 files changed, 27 insertions, 27 deletions
diff --git a/Makefile.in b/Makefile.in
index 7e119a05c..e76a61f26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ ifeq "$(build_mode)" "coverage"
OPT_FLAGS+=-fprofile-arcs -ftest-coverage
endif
-GNATFLAGS=-gnaty3befhkmr -gnatwa -gnatf -gnat05 $(OPT_FLAGS) $(ADA_FLAGS)
+GNATFLAGS=-gnaty3befhkmr -gnatwa -gnatf $(OPT_FLAGS) $(ADA_FLAGS)
GRT_FLAGS=$(OPT_FLAGS)
WARN_CFLAGS=-Wall
@@ -184,7 +184,7 @@ install.mcode: install.mcode.program install.vhdllib install.vpi
oread-mcode$(EXEEXT): force
$(MAKE) -f $(srcdir)/src/ortho/mcode/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
- GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all
+ GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all
#################### For gcc backend ##############################
@@ -251,7 +251,7 @@ GHDL_GCC_INCFLAGS=$(GHDL_COMMON_INCFLAGS)
ghdl1-gcc$(EXEEXT): version.ads force
$(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
- GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all
+ GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all
ghdl_gcc$(EXEEXT): version.ads force
$(GNATMAKE) $(GHDL_GCC_INCFLAGS) -aI$(srcdir)/src/ghdldrv \
@@ -263,13 +263,13 @@ libs.vhdl.local_gcc: ghdl_gcc$(EXEEXT) ghdl1-gcc$(EXEEXT)
ghdl1-debug$(EXEEXT): version.ads force
$(MAKE) -f $(srcdir)/src/ortho/debug/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
- GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \
+ GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \
GNATMAKE="$(GNATMAKE)" all
oread-gcc$(EXEEXT): force
$(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
- GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all
+ GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all
#################### For llvm backend ##############################
@@ -304,7 +304,7 @@ ghdl_llvm$(EXEEXT): version.ads force
ghdl1-llvm$(EXEEXT): version.ads force
$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
- GNAT_FLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \
LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" GNATMAKE="$(GNATMAKE)" \
all
@@ -312,7 +312,7 @@ oread-llvm$(EXEEXT): force
$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
GNATMAKE="$(GNATMAKE)" \
- GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \
+ GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \
LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
@@ -344,7 +344,7 @@ LIBGHDL_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/vhdl/python -aI$(srcdi
libghdl_name=libghdl-$(libghdl_version)$(SOEXT)
$(libghdl_name): $(GRT_SRC_DEPS) version.ads force
- $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ $(GNATFLAGS) $(PIC_FLAGS) -gnat05 $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -shared $(SHLIB_FLAGS)
+ $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -shared $(SHLIB_FLAGS)
all.libghdl.true: $(libghdl_name)
all.libghdl.false:
diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in
index ae163d953..bf2290b1e 100644
--- a/dist/gcc/Make-lang.in
+++ b/dist/gcc/Make-lang.in
@@ -41,7 +41,7 @@ RM = rm -f
# Extra flags to pass to recursive makes.
-GHDL_ADAFLAGS=-gnata -gnat05 -gnaty3befhkmr -gnatwae
+GHDL_ADAFLAGS=-gnata -gnaty3befhkmr -gnatwae
GNATBIND = gnatbind
GNATMAKE = gnatmake
diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc
index 9c6fad5a0..da85ae014 100644
--- a/src/grt/Makefile.inc
+++ b/src/grt/Makefile.inc
@@ -98,7 +98,7 @@ MSYS2_ARG=MSYS2_ARG_CONV_EXCL="-aI;-gnatec"
# Configuration pragmas.
# -gnatdY is required to force the use of __gnat_last_chance_handler.
-GRT_PRAGMA_FLAG=-gnatec$(GRTSRCDIR)/grt.adc -gnat05 -gnatdY
+GRT_PRAGMA_FLAG=-gnatec$(GRTSRCDIR)/grt.adc -gnatdY
# Rule to compile an Ada file.
GRT_ADACOMPILE=$(GNATMAKE) -u -c $(GRT_FLAGS) $(GRT_PRAGMA_FLAG)
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
diff --git a/src/vhdl/translate/Makefile b/src/vhdl/translate/Makefile
index b331b5728..07b3511e8 100644
--- a/src/vhdl/translate/Makefile
+++ b/src/vhdl/translate/Makefile
@@ -18,19 +18,19 @@
BE=gcc
ortho_srcdir=../ortho
-GNAT_FLAGS=-aI.. -aI../psl -gnaty3befhkmr -gnata -gnatf -gnatwael -gnat05
-#GNAT_FLAGS+=-O -gnatn
+GNATFLAGS=-aI.. -aI../psl -gnaty3befhkmr -gnata -gnatf -gnatwael
+#GNATFLAGS+=-O -gnatn
LN=ln -s
compiler: force # ortho_nodes.ads ortho_$(BE)_front.ads
$(MAKE) -f $(ortho_srcdir)/$(BE)/Makefile \
- ortho_srcdir=$(ortho_srcdir) GNAT_FLAGS="$(GNAT_FLAGS)" \
+ ortho_srcdir=$(ortho_srcdir) GNATFLAGS="$(GNATFLAGS)" \
ortho_exec=ghdl1-$(BE) all
all:
[ -d lib ] || mkdir lib
$(MAKE) -f $(ortho_srcdir)/gcc/Makefile \
- ortho_srcdir=$(ortho_srcdir) GNAT_FLAGS="$(GNAT_FLAGS)" \
+ ortho_srcdir=$(ortho_srcdir) GNATFLAGS="$(GNATFLAGS)" \
ortho_exec=ghdl1-gcc all
$(MAKE) -C ghdldrv
$(MAKE) -C grt all libdir=`pwd`/lib
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 02:50:57 +0000