From b297a0a9fef9e419ca3d02349073f7738f6aae6e Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Fri, 25 Jan 2008 17:33:32 -0800 Subject: [PATCH] Remove support for vvp32 build Remove configure and Makefile support for the vvp32 build. Remove also the libdir64 support. --- Makefile.in | 4 --- cadpli/Makefile.in | 14 +-------- cadpli/configure.in | 15 ---------- cadpli/enable_vvp32.mk | 39 ------------------------- configure.in | 26 ----------------- iverilog-vpi.sh | 20 ++----------- libveriuser/Makefile.in | 42 ++++----------------------- libveriuser/configure.in | 14 --------- verilog.spec | 24 ++-------------- vpi/Makefile.in | 35 ++--------------------- vpi/configure.in | 26 ----------------- vvp/Makefile.in | 61 ++++------------------------------------ 12 files changed, 20 insertions(+), 300 deletions(-) delete mode 100644 cadpli/enable_vvp32.mk diff --git a/Makefile.in b/Makefile.in index 189ebeb74..9326070cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,8 +41,6 @@ libdir = @libdir@ includedir = @includedir@ mandir = @mandir@ -libdir64 = @libdir64@ - dllib=@DLLIB@ CC = @CC@ @@ -147,8 +145,6 @@ iverilog-vpi: iverilog-vpi.sh -e 's;@IVCXX@;$(CXX);' \ -e 's;@IVCFLAGS@;$(CXXFLAGS);' \ -e 's;@INCLUDEDIR@;@includedir@;' \ - -e 's;@LIBDIR64@;@libdir64@;' \ - -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \ -e 's;@LIBDIR@;@libdir@;' $< > $@ chmod +x $@ endif diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 61051e6de..e98089888 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -33,7 +33,7 @@ bindir = @bindir@ libdir = @libdir@ includedir = $(prefix)/include -vpidir = @libdir@/ivl/@vpidir1@ +vpidir = @libdir@/ivl CC = @CC@ INSTALL = @INSTALL@ @@ -48,14 +48,6 @@ SHARED = @shared@ all: -ifeq (@enable_vvp32@,yes) -vpidir32 = $(libdir)/ivl/@vpidir2@ -ALL32 = all32 -INSTALL32 = install32 -UNINSTALL32 = uninstall32 -include $(srcdir)/enable_vvp32.mk -endif - all: dep cadpli.vpl $(ALL32) # No specific check operations. @@ -97,8 +89,4 @@ uninstall: $(UNINSTALL32) uninstall32: -ifeq (@enable_vvp32@,yes) -include $(srcdir)/enable_vvp32.mk -endif - -include $(patsubst %.o, dep/%.d, $O) diff --git a/cadpli/configure.in b/cadpli/configure.in index 79bf30b03..99f1a1e45 100644 --- a/cadpli/configure.in +++ b/cadpli/configure.in @@ -12,10 +12,6 @@ AX_WIN32 AC_PROG_INSTALL -# vvp32 is by default disabled -#enable_vvp32=no -AC_SUBST(enable_vvp32) - AC_CHECK_HEADERS(malloc.h) AC_CHECK_SIZEOF(unsigned long long) @@ -62,15 +58,4 @@ AX_C_UNDERSCORES_TRAILING AX_CPP_IDENT -# where to put vpi subdirectories -AC_MSG_CHECKING(for VPI subdirectories) -if test x${vpidir1} = x -then - vpidir1="." -fi - -AC_SUBST(vpidir1) -AC_SUBST(vpidir2) -AC_MSG_RESULT(${vpidir1} ${vpidir2}) - AC_OUTPUT(Makefile) diff --git a/cadpli/enable_vvp32.mk b/cadpli/enable_vvp32.mk deleted file mode 100644 index f39aa6d75..000000000 --- a/cadpli/enable_vvp32.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# This source code is free software; you can redistribute it -# and/or modify it in source code form under the terms of the GNU -# Library General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# This program 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 Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -#ident "$Id: enable_vvp32.mk,v 1.1 2003/10/09 01:07:20 steve Exp $" -# - -all32: bin32 bin32/cadpli.vpl - -bin32: - mkdir bin32 - -bin32/%.o: %.c - $(CC) -m32 -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ - -bin32/cadpli.vpl: $(addprefix bin32/,$O) ../vvp/bin32/libvpi.a ../libveriuser/bin32/libveriuser.o - $(CC) $(SHARED) -m32 -o $@ $(addprefix bin32/,$O) ../libveriuser/bin32/libveriuser.o ../vvp/bin32/libvpi.a - -install32: all32 $(vpidir32)/cadpli.vpl - -$(vpidir32)/cadpli.vpl: bin32/cadpli.vpl - $(INSTALL_PROGRAM) bin32/cadpli.vpl $(vpidir32)/cadpli.vpl - -uninstall32: - rm -f $(vpidir32)/cadpli.vpl diff --git a/configure.in b/configure.in index 1b5040425..4f4220c69 100644 --- a/configure.in +++ b/configure.in @@ -42,11 +42,6 @@ AC_SUBST(EXEEXT) # Combined check for Microsoft-related bogosities; sets WIN32 if found AX_WIN32 -# vvp32 is by default disabled -#enable_vvp32=no -AC_SUBST(enable_vvp32) - - AC_LANG_CPLUSPLUS AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h) @@ -123,27 +118,6 @@ AX_C_UNDERSCORES_TRAILING AX_CPP_IDENT -# If not otherwise specified, set the libdir64 variable -# to the same as libdir. -AC_MSG_CHECKING(for libdir64 path) -if test x${libdir64} = x -then - libdir64="${libdir}" -fi -AC_SUBST(libdir64) -AC_MSG_RESULT(${libdir64}) - -# where to put vpi subdirectories -AC_MSG_CHECKING(for VPI subdirectories) -if test x${vpidir1} = x -then - vpidir1="." -fi - -AC_SUBST(vpidir1) -AC_SUBST(vpidir2) -AC_MSG_RESULT(${vpidir1} ${vpidir2}) - # XXX disable tgt-fpga for the moment AC_CONFIG_SUBDIRS(vvp vpi tgt-stub tgt-null tgt-vvp libveriuser cadpli) diff --git a/iverilog-vpi.sh b/iverilog-vpi.sh index cf8738637..b49abe6cc 100644 --- a/iverilog-vpi.sh +++ b/iverilog-vpi.sh @@ -26,20 +26,9 @@ CFLAGS="@PIC@ @IVCFLAGS@ -I@INCLUDEDIR@" # These are used for linking... LD=$CC -LDFLAGS32="@SHARED@ -L@LIBDIR@" -LDFLAGS64="@SHARED@ -L@LIBDIR64@" -LDFLAGS="$LDFLAGS64" +LDFLAGS="@SHARED@ -L@LIBDIR@" LDLIBS="-lveriuser -lvpi" -INSTDIR64="@VPIDIR1@" -INSTDIR32="@VPIDIR2@" -if test x$INSTDIR32 = x -then - INSTDIR32=$INSTDIR64 -fi - -INSTDIR="$INSTDIR64" - CCSRC= CXSRC= OBJ= @@ -96,11 +85,6 @@ do -D*) DEFS="$DEFS $parm" ;; - -m32) LDFLAGS="-m32 $LDFLAGS32" - CFLAGS="-m32 $CFLAGS" - INSTDIR="$INSTDIR32" - ;; - --cflags) echo "$CFLAGS" exit; @@ -117,7 +101,7 @@ do ;; --install-dir) - echo "@LIBDIR@/ivl/$INSTDIR" + echo "@LIBDIR@/ivl" exit ;; esac diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 54c647a81..c8a56679c 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -30,7 +30,6 @@ VPATH = $(srcdir) bindir = @bindir@ libdir = @libdir@ -libdir64 = @libdir64@ includedir = $(prefix)/include CC = @CC@ @@ -58,12 +57,6 @@ getlongp.o getp.o getsimtime.o io_print.o math.o mc_scan_plusargs.o \ nodeinfo.o nump.o putlongp.o putp.o spname.o typep.o workarea.o \ veriusertfs.o priv.o $A -ifeq (@enable_vvp32@,yes) -ALL32 = all32 -INSTALL32 = install32 -UNINSTALL32 = uninstall32 -endif - all: dep libveriuser.a $(ALL32) check: all @@ -93,40 +86,15 @@ clean: distclean: clean rm -f Makefile config.status config.log config.cache config.h -install:: all installdirs $(libdir64)/libveriuser.a $(INSTALL32) +install:: all installdirs $(libdir)/libveriuser.a $(INSTALL32) -$(libdir64)/libveriuser.a: ./libveriuser.a - $(INSTALL_DATA) ./libveriuser.a $(libdir64)/libveriuser.a +$(libdir)/libveriuser.a: ./libveriuser.a + $(INSTALL_DATA) ./libveriuser.a $(libdir)/libveriuser.a installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(includedir) $(libdir64) + $(srcdir)/mkinstalldirs $(includedir) $(libdir) uninstall:: - rm -f $(libdir64)/libveriuser.a - -ifeq (@enable_vvp32@,yes) -all32: bin32 bin32/libveriuser.a - -bin32: - mkdir bin32 - -bin32/%.o: %.c - $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ - -bin32/libveriuser.o: $(addprefix bin32/,$O) - $(LD) -melf_i386 -r -o $@ $(addprefix bin32/,$O) - -bin32/libveriuser.a: bin32/libveriuser.o - rm -f $@ - ar cvq $@ bin32/libveriuser.o - $(RANLIB) $@ - -install32: $(libdir)/libveriuser.a - -$(libdir)/libveriuser.a: bin32/libveriuser.a - $(INSTALL_DATA) bin32/libveriuser.a $(libdir)/libveriuser.a - --include $(patsubst bin32/%.o, bin32/%.d, $(addprefix bin32/,$O)) -endif + rm -f $(libdir)/libveriuser.a -include $(patsubst %.o, dep/%.d, $O) diff --git a/libveriuser/configure.in b/libveriuser/configure.in index a66c623e6..e185749be 100644 --- a/libveriuser/configure.in +++ b/libveriuser/configure.in @@ -10,10 +10,6 @@ AC_PROG_RANLIB AC_EXEEXT AX_CPP_IDENT -# vvp32 is by default disabled -#enable_vvp32=no -AC_SUBST(enable_vvp32) - AC_CHECK_HEADERS(malloc.h) AC_CHECK_SIZEOF(unsigned long long) @@ -29,14 +25,4 @@ AX_C_PICFLAG AC_SUBST(EXEEXT) AC_SUBST(EXTRALIBS) -# If not otherwise specified, set the libdir64 variable -# to the same as libdir. -AC_MSG_CHECKING(for libdir64 path) -if test x${libdir64} = x -then - libdir64="${libdir}" -fi -AC_SUBST(libdir64) -AC_MSG_RESULT(${libdir64}) - AC_OUTPUT(Makefile) diff --git a/verilog.spec b/verilog.spec index 2c29bbb10..1fca141aa 100644 --- a/verilog.spec +++ b/verilog.spec @@ -12,16 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-20070812-%{release}-root BuildRequires: gcc-c++, zlib-devel, bison, flex, gperf, readline-devel -%ifarch x86_64 -BuildRequires: bzip2-32bit, glibc-devel-32bit, glibc-32bit, zlib-devel-32bit -BuildRequires: termcap-32bit, readline-32bit, readline-devel-32bit - -%if 0%{?suse_version} == 1020 -BuildRequires: gcc-32bit, libstdc++41-devel-32bit -%endif - -%endif - # This provides tag allows me to use a more specific name for things # that actually depend on me, Icarus Verilog. Provides: iverilog @@ -35,11 +25,7 @@ to the IEEE-1364 standard. %setup -n verilog-20070812 %build -%ifarch x86_64 -./configure --prefix=/usr --mandir='$(prefix)/share/man' libdir64='$(prefix)/lib64' vpidir1=vpi64 vpidir2=. --enable-vvp32 -%else ./configure --prefix=/usr --mandir='$(prefix)/share/man' -%endif make CXXFLAGS=-O %install @@ -77,13 +63,6 @@ rm -rf $RPM_BUILD_ROOT #%attr(-,root,root) /usr/lib/ivl/fpga-s.conf #%attr(-,root,root) /usr/lib/ivl/xnf.conf #%attr(-,root,root) /usr/lib/ivl/xnf-s.conf -%ifarch x86_64 -%attr(-,root,root) /usr/bin/vvp32 -%attr(-,root,root) /usr/lib/ivl/vpi64/system.vpi -%attr(-,root,root) /usr/lib/ivl/vpi64/cadpli.vpl -%attr(-,root,root) /usr/lib64/libvpi.a -%attr(-,root,root) /usr/lib64/libveriuser.a -%endif %attr(-,root,root) /usr/lib/ivl/system.sft %attr(-,root,root) /usr/lib/ivl/system.vpi %attr(-,root,root) /usr/lib/ivl/cadpli.vpl @@ -98,3 +77,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -n verilog * Sun Feb 28 2007 - steve@icarus.com - Added formatting suitable for openSUSE packaging. + +* Fri Jan 25 2008 - steve@icarus.com +- Removed vvp32 support for x86_64 build. diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 1c7a5cab2..1c335e1bb 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -33,7 +33,7 @@ bindir = @bindir@ libdir = @libdir@ includedir = $(prefix)/include -vpidir = $(libdir)/ivl/@vpidir1@ +vpidir = $(libdir)/ivl CC = @CC@ INSTALL = @INSTALL@ @@ -46,13 +46,6 @@ CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ -ifeq (@enable_vvp32@,yes) -vpidir32 = $(libdir)/ivl/@vpidir2@ -ALL32 = all32 -INSTALL32 = install32 -UNINSTALL32 = uninistall32 -endif - all: dep system.vpi $(ALL32) dep: @@ -95,28 +88,6 @@ sdf_lexor.c: sdf_lexor.lex sdf_parse.c sdf_parse.h: $(srcdir)/sdf_parse.y $(YACC) --verbose -d -p sdf -o sdf_parse.c $(srcdir)/sdf_parse.y -ifeq (@enable_vvp32@,yes) - -all32: bin32 bin32/system.vpi - -bin32: - mkdir bin32 - -bin32/%.o: %.c - $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ - -bin32/system.vpi: $(addprefix bin32/,$O) - $(CC) -m32 @shared@ -o $@ $(addprefix bin32/,$O) -L../vvp/bin32 $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS) - -install32: all32 $(vpidir32)/system.vpi - -$(vpidir32)/system.vpi: bin32/system.vpi - $(INSTALL_PROGRAM) bin32/system.vpi $(vpidir32)/system.vpi - -uninstall32: - rm -f $(vpidir32)/system.vpi -endif - clean: rm -rf *.o sys_readmem_lex.c dep system.vpi bin32 rm -f sdf_lexor.c sdf_parse.c sdf_parse.output sdf_parse.h @@ -126,7 +97,7 @@ distclean: clean check: all -install: all installdirs $(vpidir)/system.vpi $(libdir)/ivl/system.sft $(INSTALL32) +install: all installdirs $(vpidir)/system.vpi $(libdir)/ivl/system.sft $(vpidir)/system.vpi: ./system.vpi $(INSTALL_PROGRAM) ./system.vpi $(vpidir)/system.vpi @@ -137,7 +108,7 @@ $(libdir)/ivl/system.sft: system.sft installdirs: ../mkinstalldirs $(srcdir)/../mkinstalldirs $(vpidir) -uninstall: $(UNINSTALL32) +uninstall: rm -f $(vpidir)/system.vpi rm -f $(libdir)/ivl/system.sft diff --git a/vpi/configure.in b/vpi/configure.in index e4e98738c..e96764497 100644 --- a/vpi/configure.in +++ b/vpi/configure.in @@ -31,11 +31,6 @@ AX_WIN32 AX_CPP_IDENT -# vvp32 is by default disabled -#enable_vvp32=no -AC_SUBST(enable_vvp32) - - AC_CHECK_HEADERS(malloc.h inttypes.h) AC_CHECK_LIB(z, gzwrite) @@ -99,25 +94,4 @@ AX_LD_SHAREDLIB_OPTS AX_CPP_IDENT -# If not otherwise specified, set the libdir64 variable -# to the same as libdir. -AC_MSG_CHECKING(for libdir64 path) -if test x${libdir64} = x -then - libdir64="${libdir}" -fi -AC_SUBST(libdir64) -AC_MSG_RESULT(${libdir64}) - -# where to put vpi subdirectories -AC_MSG_CHECKING(for VPI subdirectories) -if test x${vpidir1} = x -then - vpidir1="." -fi - -AC_SUBST(vpidir1) -AC_SUBST(vpidir2) -AC_MSG_RESULT(${vpidir1} ${vpidir2}) - AC_OUTPUT(Makefile) diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 5998e85a5..d57233851 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -33,8 +33,6 @@ libdir = @libdir@ mandir = @mandir@ includedir = @includedir@ -libdir64 = @libdir64@ - CC = @CC@ HOSTCC = @CC@ CXX = @CXX@ @@ -58,13 +56,7 @@ ifneq (x@vpidir2@,x) MDIR2 = -DMODULE_DIR2=\"$(libdir)/ivl/@vpidir2@\" endif -ifeq (@enable_vvp32@,yes) -ALL32 = all32 -INSTALL32 = install32 -UNINSTALL32 = uninstall32 -endif - -all: dep vvp@EXEEXT@ libvpi.a $(ALL32) +all: dep vvp@EXEEXT@ libvpi.a clean: rm -f *.o *~ parse.cc parse.cc.output parse.h lexor.cc tables.cc @@ -125,33 +117,6 @@ tables.cc: $(srcdir)/draw_tt.c ./draw_tt > tables.cc rm draw_tt@EXEEXT@ -ifeq (@enable_vvp32@,yes) - -all32: bin32 vvp32 - -bin32: - mkdir bin32 - -bin32/%.o: %.cc - $(CXX) -m32 -DSIZEOF_UNSIGNED_LONG=4 $(CPPFLAGS) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $@ - -bin32/%.o: %.c - $(CC) -m32 $(CPPFLAGS) $(MDIR2) $(CFLAGS) -MD -c $< -o $@ - -bin32/lexor.o: lexor.cc parse.h - -vvp32: $(addprefix bin32/,$O) bin32/libvpi.a - $(CXX) -m32 $(LDFLAGS) -o vvp32 $(addprefix bin32/,$O) $(LIBS) $(dllib) - -bin32/libvpi.a: libvpi.c - $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -o bin32/libvpi.o -c $(srcdir)/libvpi.c - rm -f bin32/libvpi.a - ar cqv bin32/libvpi.a bin32/libvpi.o - $(RANLIB) bin32/libvpi.a - --include $(patsubst bin32/%.o, bin32/%.d, $(addprefix bin32/,$O)) -endif - lexor.o: lexor.cc parse.h parse.o: parse.cc @@ -183,13 +148,13 @@ Makefile: Makefile.in config.status ./config.status -install: all installdirs $(bindir)/vvp@EXEEXT@ $(libdir64)/libvpi.a $(INSTALL_DOC) $(INSTALL32) +install: all installdirs $(bindir)/vvp@EXEEXT@ $(libdir)/libvpi.a $(INSTALL_DOC) $(bindir)/vvp@EXEEXT@: ./vvp@EXEEXT@ $(INSTALL_PROGRAM) ./vvp@EXEEXT@ $(bindir)/vvp@EXEEXT@ -$(libdir64)/libvpi.a : ./libvpi.a - $(INSTALL_DATA) libvpi.a $(libdir64)/libvpi.a +$(libdir)/libvpi.a : ./libvpi.a + $(INSTALL_DATA) libvpi.a $(libdir)/libvpi.a $(mandir)/man1/vvp.1: $(srcdir)/vvp.man $(INSTALL_DATA) $(srcdir)/vvp.man $(mandir)/man1/vvp.1 @@ -198,26 +163,12 @@ $(prefix)/vvp.pdf: vvp.pdf $(INSTALL_DATA) vvp.pdf $(prefix)/vvp.pdf installdirs: $(srcdir)/mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(libdir) $(libdir64) $(INSTALL_DOCDIR) + $(srcdir)/mkinstalldirs $(bindir) $(libdir) $(libdir) $(INSTALL_DOCDIR) -ifeq (@enable_vvp32@,yes) -install32: all32 $(libdir)/libvpi.a $(bindir)/vvp32 - -$(libdir)/libvpi.a: bin32/libvpi.a - $(INSTALL_DATA) bin32/libvpi.a $(libdir)/libvpi.a - -$(bindir)/vvp32: ./vvp32 - $(INSTALL_PROGRAM) ./vvp32 $(bindir)/vvp32 - -uninstall32: - rm -f $(libdir)/libvpi.a - rm -f $(bindir)/vvp32 -endif - uninstall: $(UNINSTALL32) rm -f $(bindir)/vvp@EXEEXT@ - rm -f $(libdir64)/libvpi.a + rm -f $(libdir)/libvpi.a rm -f $(mandir)/man1/vvp.1 $(prefix)/vvp.pdf -include $(patsubst %.o, dep/%.d, $O)