Permalink
Browse files

Update all Makefile.in files to support OpenSolaris

This patch updates all the Makefile.in files and configure.in
as follows:

Do not use the -Wall warning flag when using the SunPro compiler.

The SunPro compiler uses -xMD instead of -MD.

There are still more fixes needed before Icarus will compile
on OpenSolaris.
  • Loading branch information...
caryr authored and steveicarus committed May 12, 2010
1 parent c8d160a commit 2aa627d89ffa2a717a3ccf99b09bc21170cf90ec
View
@@ -77,7 +77,7 @@ PS2PDF = @PS2PDF@
GIT = @GIT@
CPPFLAGS = @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
-CXXFLAGS = -Wall @CXXFLAGS@
+CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
PICFLAGS = @PICFLAG@
LDFLAGS = @rdynamic@ @LDFLAGS@
@@ -204,13 +204,13 @@ iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
endif
version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
- $(HOSTCC) -Wall -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
+ $(HOSTCC) @WARNING_FLAGS@ -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
dep:
mkdir dep
%.o: %.cc config.h
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d
# Here are some explicit dependencies needed to get things going.
View
@@ -38,7 +38,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
SHARED = @shared@
@@ -54,7 +54,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $<
mv $*.d dep
O = cadpli.o
View
@@ -58,7 +58,12 @@ AC_SUBST(EXEEXT)
# Combined check for Microsoft-related bogosities; sets WIN32 if found
AX_WIN32
-AC_LANG_CPLUSPLUS
+AC_CHECK_DECL(__SUNPRO_C, AC_SUBST(DEPENDENCY_FLAG, [-xMD]),
+ AC_SUBST(DEPENDENCY_FLAG, [-MD]))
+AC_CHECK_DECL(__SUNPRO_C, AC_SUBST(WARNING_FLAGS, []),
+ AC_SUBST(WARNING_FLAGS, [-Wall]))
+
+AC_LANG(C++)
AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h)
@@ -130,7 +135,7 @@ AC_SUBST(DLLIB)
AC_PROG_INSTALL
-AC_LANG_C
+AC_LANG(C)
AC_C_BIGENDIAN
# $host
View
@@ -42,7 +42,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: iverilog-vpi@EXEEXT@
View
@@ -42,7 +42,7 @@ MAN = @MAN@
PS2PDF = @PS2PDF@
CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep iverilog@EXEEXT@ iverilog.man
@@ -75,11 +75,11 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
mv $*.d dep
cflexor.o: cflexor.c cfparse.h
View
@@ -38,7 +38,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: ivlpp@EXEEXT@
View
@@ -36,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
RANLIB = @RANLIB@
@@ -79,7 +79,7 @@ dep:
mkdir dep
%.o: %.c config.h
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
View
@@ -39,7 +39,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep fpga.tgt
@@ -48,7 +48,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
D = d-generic.o d-generic-edif.o d-lpm.o d-virtex.o d-virtex2.o
View
@@ -35,7 +35,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep null.tgt
@@ -46,7 +46,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = null.o
View
@@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep pal.tgt
@@ -43,7 +43,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = imain.o dump_final.o emit_jed.o enables.o fit_log.o fit_reg.o pads.o
View
@@ -36,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep stub.tgt
@@ -47,7 +47,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = stub.o expression.o statement.o switches.o
View
@@ -37,7 +37,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CXXFLAGS = -Wall @CXXFLAGS@
+CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
LDFLAGS = @LDFLAGS@
all: dep vhdl.tgt vhdl.conf vhdl-s.conf
@@ -46,7 +46,7 @@ dep:
mkdir dep
%.o: %.cc vhdl_config.h
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = vhdl.o state.o vhdl_element.o vhdl_type.o vhdl_syntax.o scope.o process.o \
View
@@ -35,7 +35,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep vlog95.tgt
@@ -46,7 +46,7 @@ dep:
mkdir dep
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = vlog95.o
View
@@ -39,7 +39,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@
all: dep vvp.tgt vvp.conf vvp-s.conf
@@ -48,7 +48,7 @@ dep:
mkdir dep
%.o: %.c vvp_config.h
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
O = vvp.o draw_mux.o draw_net_input.o draw_switch.o draw_ufunc.o draw_vpi.o \
View
@@ -41,8 +41,8 @@ LEX = @LEX@
YACC = @YACC@
CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = -Wall @CFLAGS@
-CXXFLAGS = -Wall @CXXFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
+CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
LDFLAGS = @LDFLAGS@
all: dep system.vpi va_math.vpi v2005_math.vpi $(ALL32)
@@ -53,11 +53,11 @@ dep:
mkdir dep
%.o: %.c vpi_config.h
- $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
%.o: %.cc vpi_config.h
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep
# Object files for system.vpi
View
@@ -46,8 +46,8 @@ MAN = @MAN@
PS2PDF = @PS2PDF@
CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
-CXXFLAGS = -Wall @CXXFLAGS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
+CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
LDFLAGS = @rdynamic@ @LDFLAGS@
LIBS = @LIBS@ @EXTRALIBS@
@@ -121,15 +121,15 @@ dep:
mkdir dep
%.o: %.cc config.h
- $(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $*.o
+ $(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d
%.o: %.c config.h
- $(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) -MD -c $< -o $*.o
+ $(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d
tables.cc: $(srcdir)/draw_tt.c
- $(HOSTCC) -Wall -o draw_tt $(srcdir)/draw_tt.c
+ $(HOSTCC) @WARNING_FLAGS@ -o draw_tt $(srcdir)/draw_tt.c
./draw_tt > tables.cc
rm draw_tt@EXEEXT@

0 comments on commit 2aa627d

Please sign in to comment.