suzanne.soy/fpgatools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Wolfgang-Spraul/fpgatools

Browse Source
This commit is contained in:
Wolfgang Spraul 2012-10-03 15:20:51 +02:00
commit 0a0dfaca31
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -29,7 +29,7 @@ all: new_fp fp2bit bit2fp draw_svg_tiles autotest hstrrep \
include Makefile.common
%.o: %.c
$(CC) $(CFLAGS) -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
$(MKDEP)
libs/%.so: FAKE

5
libs/Makefile
View File

@ -41,11 +41,11 @@ libfpga-floorplan.so: $(LIBFPGA_FLOORPLAN_OBJS)
libfpga-control.so: $(LIBFPGA_CONTROL_OBJS)
%.so:
$(CC) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
@rm -f $@ && ln -s $@.$(LIBS_VERSION) $@
%.o: %.c
$(CC) $(CFLAGS) -fPIC -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
$(MKDEP)
clean:
@ -56,6 +56,7 @@ install: all
mkdir -p $(DESTDIR)/$(PREFIX)/include/
install -m 644 $(DYNAMIC_HEADS) $(DESTDIR)/$(PREFIX)/include/
for f in $(DYNAMIC_LIBS); do \
chrpath -d $$f.$(LIBS_VERSION) && \
install -m 644 $$f.$(LIBS_VERSION) $(DESTDIR)/$(PREFIX)/lib/$$f.$(LIBS_VERSION) && \
(cd $(DESTDIR)/$(PREFIX)/lib/ && ln -s $$f.$(LIBS_VERSION) $$f) \
|| exit 1; done

2
libs/control.c
View File

@ -1949,7 +1949,7 @@ static void fprintf_inout_pin(FILE* f, struct fpga_model* model,
fdev_type2str(tile->devs[dev_idx].type),
fdev_typeidx(model, el->y, el->x, dev_idx),
pin_str);
fprintf(f, buf);
fprintf(f, "%s", buf);
}
void fnet_printf(FILE* f, struct fpga_model* model, net_idx_t net_i)

2
libs/floorplan.c
View File

@ -758,7 +758,7 @@ int printf_conns(FILE* f, struct fpga_model* model)
tmp_line[k++] = ' ';
sprintf(&tmp_line[k], "y%02i x%02i %s\n",
other_tile_y, other_tile_x, other_tile_connpt_str);
fprintf(f, tmp_line);
fprintf(f, "%s", tmp_line);
}
}
}

2
libs/helper.c
View File

@ -825,7 +825,7 @@ void printf_wrap(FILE* f, char* line, int prefix_len,
if (i >= 80) {
line[i] = '\n';
line[i+1] = 0;
fprintf(f, line);
fprintf(f, "%s", line);
line[prefix_len] = 0;
i = prefix_len;
}

2
mini-jtag/Makefile
View File

@ -20,7 +20,7 @@ mini-jtag: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
%.o: %.c
$(CC) $(CFLAGS) -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
$(MKDEP)
install: all