Support 32bit development library for libveriuser.

libveriuser/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.29 2003/10/06 21:27:05 steve Exp $"
+#ident "$Id: Makefile.in,v 1.30 2003/10/09 00:37:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -58,7 +58,13 @@ O = asynch.o delay.o finish.o getcstringp.o getinstance.o getlongp.o \
 getp.o getsimtime.o io_print.o math.o mc_scan_plusargs.o nump.o putlongp.o \
 putp.o spname.o typep.o workarea.o veriusertfs.o priv.o $A
 
-all: dep libveriuser.a
+ifeq (@enable_vvp32@,yes)
+ALL32 = all32
+INSTALL32 = install32
+UNINSTALL32 = uninstall32
+endif
+
+all: dep libveriuser.a $(ALL32)
 
 check: all
 
@@ -87,7 +93,7 @@ clean:
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
 
-install:: all installdirs $(libdir64)/libveriuser.a
+install:: all installdirs $(libdir64)/libveriuser.a $(INSTALL32)
 
 $(libdir64)/libveriuser.a: ./libveriuser.a
 	$(INSTALL_DATA) ./libveriuser.a $(libdir64)/libveriuser.a
@@ -98,4 +104,29 @@ installdirs: mkinstalldirs
 uninstall::
 	rm -f $(libdir64)/libveriuser.a
 
+ifeq (@enable_vvp32@,yes)
+all32: bin32 bin32/libveriuser.a
+
+bin32:
+	mkdir bin32
+
+bin32/%.o: %.c
+	$(CC) -m32 -Wall $(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
+
 -include $(patsubst %.o, dep/%.d, $O)

libveriuser/configure.in

@@ -8,6 +8,10 @@ AC_PROG_RANLIB
 AC_CYGWIN
 AC_EXEEXT
 
+# vvp32 is by default disabled
+#enable_vvp32=no
+AC_SUBST(enable_vvp32)
+
 AC_CHECK_HEADERS(malloc.h)
 
 AC_CHECK_SIZEOF(unsigned long long)

verilog.spec

@@ -61,10 +61,10 @@ make prefix=$RPM_BUILD_ROOT/usr install
 %attr(-,root,root) /usr/lib64/libveriuser.a
 %else
 %attr(-,root,root) /usr/lib/ivl/cadpli.vpl
-%attr(-,root,root) /usr/lib/libveriuser.a
 %endif
 %attr(-,root,root) /usr/lib/ivl/system.vpi
 %attr(-,root,root) /usr/lib/libvpi.a
+%attr(-,root,root) /usr/lib/libveriuser.a
 %attr(-,root,root) /usr/include/ivl_target.h
 %attr(-,root,root) /usr/include/vpi_user.h
 %attr(-,root,root) /usr/include/acc_user.h