Firebee/BaS_gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to not compile -mshort

Browse Source 
there appears to be something wrong with -mshort -mcpu=547x (undef symbol)
Disable mshort compilation until this has been fixed
This commit is contained in:
Markus Fröschle
2017-12-25 13:00:29 +01:00
parent 92a68e51c8
commit efbbaaac3d
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tos/jtagwait/Makefile
View File

@@ -1,3 +1,9 @@
ifneq (yes,$(VERBOSE))
Q=@
else
Q=
endif
CROSS=Y CROSS=Y
CROSSBINDIR_IS_Y=m68k-atari-mint- CROSSBINDIR_IS_Y=m68k-atari-mint-
@@ -21,10 +27,10 @@ endif
DEPEND=depend DEPEND=depend
TOPDIR = ../.. TOPDIR = ../..
LIBCMINI=$(TOPDIR)/../libcmini/libcmini #LIBCMINI=$(TOPDIR)/../libcmini/libcmini
INCLUDE=-I$(LIBCMINI)/include -nostdlib #INCLUDE=-I$(LIBCMINI)/include -nostdlib
LIBS=-lcmini -nostdlib -lgcc #LIBS=-lcmini -nostdlib -lgcc
CC=$(PREFIX)/bin/gcc CC=$(PREFIX)/bin/gcc
CC=$(CROSSBINDIR)gcc CC=$(CROSSBINDIR)gcc
@@ -35,8 +41,7 @@ APP=jtagwait.prg
TEST_APP=$(APP) TEST_APP=$(APP)
CFLAGS=\ CFLAGS=\
-O0\ -msoft-float \
-g\
-Wl,-Map,mapfile\ -Wl,-Map,mapfile\
-Wl,--defsym -Wl,__MBAR=0xff000000\ -Wl,--defsym -Wl,__MBAR=0xff000000\
-Wl,--defsym -Wl,__MMUBAR=0xff040000\ -Wl,--defsym -Wl,__MMUBAR=0xff040000\
@@ -58,7 +63,7 @@ COBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.c,%.o,$(CSRCS)))
AOBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.S,%.o,$(ASRCS))) AOBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.S,%.o,$(ASRCS)))
OBJS=$(COBJS) $(AOBJS) OBJS=$(COBJS) $(AOBJS)
TRGTDIRS=./m5475 ./m5475/mshort TRGTDIRS=./m5475
OBJDIRS=$(patsubst %,%/objs,$(TRGTDIRS)) OBJDIRS=$(patsubst %,%/objs,$(TRGTDIRS))
# #
@@ -74,30 +79,30 @@ all:$(patsubst %,%/$(APP),$(TRGTDIRS))
define CC_TEMPLATE define CC_TEMPLATE
$(1)/objs/%.o:$(SRCDIR)/%.c $(1)/objs/%.o:$(SRCDIR)/%.c
@echo CC $$< @echo CC $$<
@$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(Q)$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
$(1)/objs/%.o:$(SRCDIR)/%.S $(1)/objs/%.o:$(SRCDIR)/%.S
@echo CC $$< @echo CC $$<
@$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(Q)$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
$(1)/$(APP): $$($(1)_OBJS) $(1)/$(APP): $$($(1)_OBJS)
@echo CC $$@ @echo CC $$@
@$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) $(Q)$(CC) $$(CFLAGS) -o $$@ $$($(1)_OBJS) $(LIBS)
@$(STRIP) $$@ $(Q)$(STRIP) $$@
endef endef
$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
$(DEPEND): $(ASRCS) $(CSRCS) $(DEPEND): $(ASRCS) $(CSRCS)
@-rm -f $(DEPEND) $(Q)-rm -f $(DEPEND)
@for d in $(TRGTDIRS);\ $(Q)for d in $(TRGTDIRS);\
do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \
done done
clean: clean:
@rm -f $(patsubst %,%/objs/*.o,$(TRGTDIRS)) $(patsubst %,%/$(APP),$(TRGTDIRS)) $(Q)rm -f $(patsubst %,%/objs/*.o,$(TRGTDIRS)) $(patsubst %,%/$(APP),$(TRGTDIRS))
@rm -f $(DEPEND) mapfile $(Q)rm -f $(DEPEND) mapfile
.PHONY: printvars .PHONY: printvars
printvars: printvars:

2
tos/jtagwait/sources/bas_printf.c
View File

@@ -362,7 +362,7 @@ void xaddchar(int c)
*xstring++ = (char) c; *xstring++ = (char) c;
} }
int sprintf(char *str, const char *format, ...) int xsprintf(char *str, const char *format, ...)
{ {
va_list va; va_list va;
va_start(va, format); va_start(va, format);

10
tos/jtagwait/sources/jtagwait.c
View File

@@ -86,10 +86,10 @@ void wait_for_jtag(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
printf("\033E\r\nFPGA JTAG configuration support\r\n"); Cconws("\033E\r\nFPGA JTAG configuration support\r\n");
printf("\xbd 2014 M. Fr\x94schle\r\n"); Cconws("\xbd 2014 M. Fr\x94schle\r\n");
printf("You may now savely load a new FPGA configuration through the JTAG interface\r\n" Cconws("You may now savely load a new FPGA configuration through the JTAG interface\r\n"
"and your Firebee will reboot once finished using that new configuration.\r\n"); "and your Firebee will reboot once finished using that new configuration.\r\n");
if (argc == 2) if (argc == 2)
{ {
@@ -109,11 +109,11 @@ int main(int argc, char *argv[])
*/ */
bas_start = (long) addr; bas_start = (long) addr;
printf("BaS start address set to %p\r\n", (void *) bas_start); //printf("BaS start address set to %p\r\n", (void *) bas_start);
} }
else else
{ {
printf("\r\nNote: BaS start address %p not valid. Stick to %p.\r\n", addr, (void *) bas_start); //printf("\r\nNote: BaS start address %p not valid. Stick to %p.\r\n", addr, (void *) bas_start);
} }
} }
Supexec(wait_for_jtag); Supexec(wait_for_jtag);