diff options
Diffstat (limited to 'src/ghdldrv')
| -rw-r--r-- | src/ghdldrv/Makefile | 193 | ||||
| -rw-r--r-- | src/ghdldrv/default_paths.ads.in (renamed from src/ghdldrv/default_pathes.ads.in) | 6 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlcomp.adb | 4 | ||||
| -rw-r--r-- | src/ghdldrv/ghdldrv.adb | 26 | ||||
| -rw-r--r-- | src/ghdldrv/ghdllocal.adb | 16 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlvpi.adb | 2 |
6 files changed, 27 insertions, 220 deletions
diff --git a/src/ghdldrv/Makefile b/src/ghdldrv/Makefile deleted file mode 100644 index b900fca39..000000000 --- a/src/ghdldrv/Makefile +++ /dev/null @@ -1,193 +0,0 @@ -# -*- Makefile -*- for the GHDL drivers. -# Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold -# -# GHDL is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2, or (at your option) any later -# version. -# -# GHDL is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with GCC; see the file COPYING. If not, write to the Free -# Software Foundation, 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -GNATFLAGS=-gnaty3befhkmr -gnata -gnatwael -aI../.. -aI.. -aI../../psl -aI../grt -aO.. -g -gnatf -gnat05 -GRT_FLAGS=-g -LIB_CFLAGS=-g -O2 -GNATMAKE=gnatmake -CC=gcc - -# Optimize, do not forget to use MODE=--genfast for iirs.adb. -#GNATFLAGS+=-O -gnatn -#GRT_FLAGS+=-O - -# Profiling. -#GNATFLAGS+=-pg -gnatn -O -#GRT_FLAGS+=-pg -O - -# Coverage -#GNATFLAGS+=-fprofile-arcs -ftest-coverage - -GNAT_BARGS=-bargs -E - -LLVM_CONFIG=llvm-config - -#GNAT_LARGS= -static -all: ghdl_mcode$(EXEEXT) - -target=i686-pc-linux-gnu -#target=x86_64-pc-linux-gnu -#target=i686-apple-darwin -#target=x86_64-apple-darwin -#target=i386-pc-mingw32 -GRTSRCDIR=../grt -include $(GRTSRCDIR)/Makefile.inc - -ifeq ($(filter-out i%86 linux,$(arch) $(osys)),) - ORTHO_X86_FLAGS=Flags_Linux -endif -ifeq ($(filter-out i%86 darwin%,$(arch) $(osys)),) - ORTHO_X86_FLAGS=Flags_Macosx -endif -ifeq ($(filter-out i%86 mingw32%,$(arch) $(osys)),) - ORTHO_X86_FLAGS=Flags_Windows -endif -ifdef ORTHO_X86_FLAGS - ORTHO_DEPS=ortho_code-x86-flags.ads -endif - -ortho_code-x86-flags.ads: - echo "with Ortho_Code.X86.$(ORTHO_X86_FLAGS);" > $@ - echo "package Ortho_Code.X86.Flags renames Ortho_Code.X86.$(ORTHO_X86_FLAGS);" >> $@ - -ghdl_mcode$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_mcode$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) memsegs_c.o chkstk.o force - $(GNATMAKE) -o $@ -aI../../ortho/mcode -aI../../ortho $(GNATFLAGS) ghdl_jit.adb $(GNAT_BARGS) -largs memsegs_c.o chkstk.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) - -memsegs_c.o: ../../ortho/mcode/memsegs_c.c - $(CC) -c -g -o $@ $< - -ghdl_llvm_jit$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_llvm_jit$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) llvm-cbindings.o force - $(GNATMAKE) -o $@ -aI../../ortho/llvm -aI../../ortho $(GNATFLAGS) ghdl_jit.adb $(GNAT_BARGS) -largs llvm-cbindings.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) `$(LLVM_CONFIG) --ldflags --libs --system-libs` -lc++ - -llvm-cbindings.o: ../../ortho/llvm/llvm-cbindings.cpp - $(CXX) -c -m64 `$(LLVM_CONFIG) --includedir --cxxflags` -g -o $@ $< - -ghdl_simul$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) force - $(GNATMAKE) -aI../../simulate $(GNATFLAGS) ghdl_simul$(EXEEXT) $(GNAT_BARGS) -largs $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) - -ghdl_gcc$(EXEEXT): default_pathes.ads force - $(GNATMAKE) $(GNATFLAGS) ghdl_gcc $(GNAT_BARGS) -largs $(GNAT_LARGS) - -ghdl_llvm$(EXEEXT): default_pathes.ads force - $(GNATMAKE) $(GNATFLAGS) ghdl_llvm $(GNAT_BARGS) -largs $(GNAT_LARGS) - -default_pathes.ads: default_pathes.ads.in Makefile - curdir=`cd ..; pwd`; \ - sed -e "s%@COMPILER_GCC@%$$curdir/ghdl1-gcc$(EXEEXT)%" \ - -e "s%@COMPILER_DEBUG@%$$curdir/ghdl1-debug$(EXEEXT)%" \ - -e "s%@COMPILER_MCODE@%$$curdir/ghdl1-mcode$(EXEEXT)%" \ - -e "s%@COMPILER_LLVM@%$$curdir/ghdl1-llvm$(EXEEXT)%" \ - -e "s%@POST_PROCESSOR@%$$curdir/../ortho/oread/oread-gcc$(EXEEXT)%" \ - -e "s%@INSTALL_PREFIX@%%" \ - -e "s%@LIB_PREFIX@%$$curdir/lib/%" < $< > $@ - -bootstrap.old: force - $(RM) ../../libraries/std-obj87.cf - $(MAKE) -C ../../libraries EXT=obj \ - ANALYSE="$(PWD)/ghdl$(EXEEXT) -a -g" std-obj87.cf - $(RM) ../../libraries/std-obj93.cf - $(MAKE) -C ../../libraries EXT=obj \ - ANALYSE="$(PWD)/ghdl$(EXEEXT) -a -g" std-obj93.cf - -LIB87_DIR:=../lib/v87 -LIB93_DIR:=../lib/v93 -LIB08_DIR:=../lib/v08 - -LIBSRC_DIR:=../../libraries -REL_DIR:=../.. -GHDL=ghdl$(EXEEXT) -ANALYZE:=../../../ghdldrv/$(GHDL) -a $(LIB_CFLAGS) -LN=ln -s -CP=cp - -$(LIB87_DIR) $(LIB93_DIR) $(LIB08_DIR): - [ -d ../lib ] || mkdir ../lib - [ -d $@ ] || mkdir $@ - -include ../../libraries/Makefile.inc - -GHDL1=../ghdl1-gcc$(EXEEXT) -$(LIB93_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) - $(GHDL1) --std=93 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard -else - $(GHDL1) --std=93 -quiet $(LIB_CFLAGS) -o std_standard.s \ - --compile-standard - $(CC) -c -o $@ std_standard.s - $(RM) std_standard.s -endif - -$(LIB87_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) - $(GHDL1) --std=87 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard -else - $(GHDL1) --std=87 -quiet $(LIB_CFLAGS) -o std_standard.s \ - --compile-standard - $(CC) -c -o $@ std_standard.s - $(RM) std_standard.s -endif - -$(LIB08_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) - $(GHDL1) --std=08 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard -else - $(GHDL1) --std=08 -quiet $(LIB_CFLAGS) -o std_standard.s \ - --compile-standard - $(CC) -c -o $@ std_standard.s - $(RM) std_standard.s -endif - -install.v93: std.v93 ieee.v93 synopsys.v93 mentor.v93 -install.v87: std.v87 ieee.v87 synopsys.v87 -install.v08: std.v08 ieee.v08 - -install.standard: $(LIB93_DIR)/std/std_standard.o \ - $(LIB87_DIR)/std/std_standard.o \ - $(LIB08_DIR)/std/std_standard.o - -grt.links: - cd ../lib; ln -sf $(GRTSRCDIR)/grt.lst .; ln -sf $(GRTSRCDIR)/libgrt.a .; ln -sf $(GRTSRCDIR)/grt.ver . - -install.all: install.v87 install.v93 install.v08 - -install.gcc: - $(MAKE) GHDL=ghdl_gcc$(EXEEXT) install.all - $(MAKE) GHDL1=../ghdl1-gcc$(EXEEXT) install.standard - -install.mcode: - $(MAKE) GHDL=ghdl_mcode$(EXEEXT) install.all - -install.simul: - $(MAKE) GHDL=ghdl_simul$(EXEEXT) install.all - -install.llvm: - $(MAKE) GHDL=ghdl_llvm$(EXEEXT) install.all - $(MAKE) GHDL1=../ghdl1-llvm$(EXEEXT) install.standard - -clean: force - $(RM) -f *.o *.ali ghdl_gcc$(EXEEXT) ghdl_mcode$(EXEEXT) ghdl_llvm$(EXEEXT) ghdl_llvm_jit$(EXEEXT) - $(RM) -f b~*.ad? *~ default_pathes.ads ghdl_simul$(EXEEXT) - $(RM) -rf ../lib - -clean-c: force - $(RM) -f memsegs_c.o chkstk.o linux.o times.o grt-cbinding.o grt-cvpi.o - -force: - -.PHONY: force clean diff --git a/src/ghdldrv/default_pathes.ads.in b/src/ghdldrv/default_paths.ads.in index 8b0801e13..da2f7cc42 100644 --- a/src/ghdldrv/default_pathes.ads.in +++ b/src/ghdldrv/default_paths.ads.in @@ -1,4 +1,4 @@ --- GHDL driver pathes -*- ada -*-. +-- GHDL driver paths -*- ada -*-. -- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold -- -- GHDL is free software; you can redistribute it and/or modify it under @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -package Default_Pathes is +package Default_Paths is -- Accept long lines. pragma Style_Checks ("M999"); @@ -40,4 +40,4 @@ package Default_Pathes is Shared_Library_Extension : constant String := "@SOEXT@"; Default_Pie : constant Boolean := "@default_pie@" = String'("yes"); -end Default_Pathes; +end Default_Paths; diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb index 49674b927..19f76c7ed 100644 --- a/src/ghdldrv/ghdlcomp.adb +++ b/src/ghdldrv/ghdlcomp.adb @@ -496,8 +496,8 @@ package body Ghdlcomp is begin Disp_Config_Prefixes; - Put_Line ("default library pathes:"); - for I in 2 .. Get_Nbr_Pathes loop + Put_Line ("default library paths:"); + for I in 2 .. Get_Nbr_Paths loop Put (' '); Put_Line (Name_Table.Image (Get_Path (I))); end loop; diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb index ae8e510f3..d9761970c 100644 --- a/src/ghdldrv/ghdldrv.adb +++ b/src/ghdldrv/ghdldrv.adb @@ -28,7 +28,7 @@ with Types; use Types; with Iirs; use Iirs; with Files_Map; with Configuration; -with Default_Pathes; +with Default_Paths; with Interfaces.C_Streams; with System; with Ghdlmain; use Ghdlmain; @@ -196,7 +196,7 @@ package body Ghdldrv is -- Add -fpic for gcc/llvm. if not Flag_Postprocess - and then Default_Pathes.Default_Pie + and then Default_Paths.Default_Pie then case Backend is when Backend_Gcc @@ -432,20 +432,20 @@ package body Ghdldrv is -- Set tools name. if Compiler_Cmd = null then if Flag_Postprocess then - Compiler_Cmd := new String'(Default_Pathes.Compiler_Debug); + Compiler_Cmd := new String'(Default_Paths.Compiler_Debug); else case Backend is when Backend_Gcc => - Compiler_Cmd := new String'(Default_Pathes.Compiler_Gcc); + Compiler_Cmd := new String'(Default_Paths.Compiler_Gcc); when Backend_Mcode => - Compiler_Cmd := new String'(Default_Pathes.Compiler_Mcode); + Compiler_Cmd := new String'(Default_Paths.Compiler_Mcode); when Backend_Llvm => - Compiler_Cmd := new String'(Default_Pathes.Compiler_Llvm); + Compiler_Cmd := new String'(Default_Paths.Compiler_Llvm); end case; end if; end if; if Post_Processor_Cmd = null then - Post_Processor_Cmd := new String'(Default_Pathes.Post_Processor); + Post_Processor_Cmd := new String'(Default_Paths.Post_Processor); end if; if Assembler_Cmd = null then Assembler_Cmd := new String'("as"); @@ -477,7 +477,7 @@ package body Ghdldrv is -- Try configured prefix declare Path : constant String := - Default_Pathes.Install_Prefix & Directory_Separator & Toolname; + Default_Paths.Install_Prefix & Directory_Separator & Toolname; begin if Is_Executable_File (Path) then return new String'(Path); @@ -535,7 +535,7 @@ package body Ghdldrv is Set_Tools_Name; Setup_Libraries (Load); Locate_Tools; - for I in 2 .. Get_Nbr_Pathes loop + for I in 2 .. Get_Nbr_Paths loop Add_Argument (Compiler_Args, new String'("-P" & Image (Get_Path (I)))); end loop; @@ -726,7 +726,7 @@ package body Ghdldrv is end if; Set_Tools_Name; - Put_Line ("Pathes at configuration:"); + Put_Line ("Paths at configuration:"); Put ("compiler command: "); Put_Line (Compiler_Cmd.all); if Flag_Postprocess then @@ -743,7 +743,7 @@ package body Ghdldrv is end case; Put ("linker command: "); Put_Line (Linker_Cmd.all); - Put_Line ("default lib prefix: " & Default_Pathes.Lib_Prefix); + Put_Line ("default lib prefix: " & Default_Paths.Lib_Prefix); New_Line; @@ -769,8 +769,8 @@ package body Ghdldrv is New_Line; - Put_Line ("default library pathes:"); - for I in 2 .. Get_Nbr_Pathes loop + Put_Line ("default library paths:"); + for I in 2 .. Get_Nbr_Paths loop Put (' '); Put_Line (Image (Get_Path (I))); end loop; diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index 229108e5a..81c3adb05 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -25,7 +25,7 @@ with Flags; with Name_Table; with Std_Names; with Disp_Vhdl; -with Default_Pathes; +with Default_Paths; with Scanner; with Errorout; with Configuration; @@ -34,7 +34,7 @@ with Options; with Iirs_Utils; use Iirs_Utils; package body Ghdllocal is - -- Version of the IEEE library to use. This just change pathes. + -- Version of the IEEE library to use. This just change paths. type Ieee_Lib_Kind is (Lib_Standard, Lib_None, Lib_Synopsys, Lib_Mentor); Flag_Ieee : Ieee_Lib_Kind; @@ -349,22 +349,22 @@ package body Ghdllocal is end if; -- Else try default path. if Lib_Prefix_Path = null then - if Is_Absolute_Path (Default_Pathes.Lib_Prefix) then - Lib_Prefix_Path := new String'(Default_Pathes.Lib_Prefix); + if Is_Absolute_Path (Default_Paths.Lib_Prefix) then + Lib_Prefix_Path := new String'(Default_Paths.Lib_Prefix); else if Exec_Prefix /= null then Lib_Prefix_Path := new String'(Exec_Prefix.all & Directory_Separator - & Default_Pathes.Lib_Prefix); + & Default_Paths.Lib_Prefix); end if; if Lib_Prefix_Path = null or else not Is_Directory (Lib_Prefix_Path.all) then Free (Lib_Prefix_Path); Lib_Prefix_Path := new - String'(Default_Pathes.Install_Prefix + String'(Default_Paths.Install_Prefix & Directory_Separator - & Default_Pathes.Lib_Prefix); + & Default_Paths.Lib_Prefix); end if; end if; else @@ -372,7 +372,7 @@ package body Ghdllocal is Flag_32bit := False; end if; - -- Add pathes for predefined libraries. + -- Add paths for predefined libraries. if not Flags.Bootstrap then Add_Library_Path ("std"); case Flag_Ieee is diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb index 6cdc3a619..f05761da6 100644 --- a/src/ghdldrv/ghdlvpi.adb +++ b/src/ghdldrv/ghdlvpi.adb @@ -21,7 +21,7 @@ with GNAT.OS_Lib; use GNAT.OS_Lib; with Ada.Command_Line; use Ada.Command_Line; with Ghdlmain; use Ghdlmain; with Ghdllocal; -with Default_Pathes; use Default_Pathes; +with Default_Paths; use Default_Paths; package body Ghdlvpi is |