From c023e783e91748c9f1a8d6d19d98130c55389a3c Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Fri, 1 Sep 2006 05:41:06 +0000 Subject: libgloss/ Merge from newlib-csl-20060320-branch: 2006-08-31 Nathan Sidwell * m68k/bdm-crt1.c: Call hardware_init_hook before copying initialized data. * m68k/Makefile.in (CF_BDM_SCRIPTS): Rename to CF_RAM_SCRIPTS. (CF_SCRIPTS): Update. (%-bdm.ld): Rename to %-ram.ld. 2006-08-25 Nathan Sidwell * m68k/Makefile.in (DBUG_BSP, DBUG_OBJS): Remove. (BDM_CRT0): New. (BDM_OBJS): Add bdm-crt1.o. (BDM_OTHER_OBJS): Remove print.o putnum.o (CF_BOARDS): New. (CF_BDM_SCRIPTS): Generated name of ram scripts. (CF_ROM_SCRIPTS): Generated name of rom scripts. (CF_SCRIPTS): Adjust. (all): Add BDM_CRT0. (bdm-crt0.o, bdm-crt1.o): New targets. (bdm-isv.o): Remove. (m5208evb, m5213evb, m52235evb, m5235evb, m5273c3, m5282evb, m5329evb, m5485evb): New. (%-bdm.ld, %-rom.ld): New. Replace individual linker script rules. (install): Remove DBUG installs. * m68k/bdm-crt0.S: New. * m68k/bdm-crt1.c: New. * m68k/bdm-exit.c: Call __reset. * m68k/bdm-isv.c: Remove. * m68k/cf.sc: Adjust to produce either rom or ram images. * m68k/dbug-exit.S, m68k/dbug-inbyte.S, m68k/dbug-outbyte.S: Remove. 2006-07-24 Nathan Sidwell Bug 844 * m68k/cf.sc: Set entry point to _start. * m68k/crt0.X (_start): New name for entrypoint (start): Weak alias for start. 2006-06-09 Nathan Sidwell * m68k/bdm-system.c (_system): Support system(NULL). 2006-06-08 Nathan Sidwell * m68k/bdm-system.c (_system): Properly encode non failure exit code. 2006-06-05 Nathan Sidwell * m68k/Makefile.in (BDM_SYSOBJS): Remove bdm-inbyte.o. Add bdm-time.o. * m68k/bdm-close.c: Add copyright notice. * m68k/bdm-fstat.c: Add copyright notice. * m68k/bdm-gettimeofday.c: Add copyright notice. * m68k/bdm-inbyte.c: Remove. * m68k/bdm-isatty.c: Add copyright notice. * m68k/bdm-lseek.c: Add copyright notice. Fix &/| thinko. * m68k/bdm-open.c: Add copyright notice. * m68k/bdm-read.c: Add copyright notice. * m68k/bdm-rename.c: Add copyright notice. * m68k/bdm-stat.c: Add copyright notice. * m68k/bdm-system.c: Add copyright notice. * m68k/bdm-time.c: New. * m68k/bdm-unlink.c: Add copyright notice. * m68k/bdm-write.c: Add copyright notice. 2006-05-25 Nathan Sidwell * m68k/Makefile.in (m52235-dbug.ld, m52235-bdm.ld): New scripts. 2006-05-24 Nathan Sidwell * m68k/Makefile.in (BDM_SYSOBJS): Remove bdm-outbyte.o. * m68k/bdm-outbyte.c: Delete. * m68k/bdm-semihost.h (BDM_OUTBYTE): Mark as obsolete. 2006-05-22 Sandra Loosemore * m68k/bdm-semihost.h: Add new constants for additional semihosting functions. Add new BDM_TRAP macro to encapsulate inline asm. * m68k/bdm-exit.c (_exit): Use new BDM_TRAP macro. * m68k/bdm-outbyte.c (outbyte): Ditto. * m68k/bdm-isrs.c, m68k/bdm-isv.c: Former BDM_TRAP now called BDM_TRAPNUM. * m68k/bdm-gdb.h, m68k/bdm-gdb.c: New files containing declarations and conversion functions for GDB's fileio protocol. * m68k/bdm-close.c: New file to define corresponding function. * m68k/bdm-fstat.c: Ditto. * m68k/bdm-gettimeofday.c: Ditto. * m68k/bdm-isatty.c: Ditto. * m68k/bdm-lseek.c: Ditto. * m68k/bdm-open.c: Ditto. * m68k/bdm-read.c: Ditto. * m68k/bdm-rename.c: Ditto. * m68k/bdm-stat.c: Ditto. * m68k/bdm-system.c: Ditto. * m68k/bdm-unlink.c: Ditto. * m68k/bdm-write.c Ditto. * m68k/Makefile.in: Add dependencies for new files. 2006-03-29 Nathan Sidwell * m68k/bdm-isv.c (software_init_hook): Fix trap numbering. * m68k/Makefile.in (CF_SCRIPTS): Add m5329 board. Reorder. (*-dbug.ld, *-bdm.ld): Add appropriate IO definition. (m5329evb-dbug.ld, m5329evb-bdm.ld): New. * cf.sc (GROUP): Revert previous change. Add IO library. * m68k/Makefile.in (BDM_BSP, BDM_OBJS, BDM_ISRS): New. (CF_SCRIPTS): Rename dbug scripts. Add bdm scripts. Add m5485 scripts. (all): Add new targets. (BDM_BSP): New target. (bdm-isv.o, bdm-exit.o, bdm-outbyte.o, bdm-semihost.o): New targets. (BDM_ISRS): New targets. (m5208evb.ld, m5213evb.ld, m5235evb.ld, m5272c3.ld, m5282evb.ld): Rename and adjust. (m5485evb-dbug): New. (m5208evb-bdm.ld, m5213evb-bdm.ld, m5235evb-bdm.ld, m5272c3-bdm.ld, m5282evb-bdm.ld, m5485evb-bdm.ld): New. (install): Add BDM_BSP. * m68k/bdm-exit.c: New * m68k/bdm-inbyte.c: New * m68k/bdm-outbyte.c: New * m68k/bdm-semihost.c: New * m68k/bdm-semihost.h: New * m68k/bdm-isrs.c: New. * m68k/bdm-isv.c: New. * dbug-cf.sc: Renamed to ... * cf.sc: ... here. Add bdm flexibility. Remove GROUP 2006-05-22 Sandra Loosemore * m68k/bdm-semihost.h: Add new constants for additional semihosting functions. Add new BDM_TRAP macro to encapsulate inline asm. * m68k/bdm-exit.c (_exit): Use new BDM_TRAP macro. * m68k/bdm-outbyte.c (outbyte): Ditto. * m68k/bdm-isrs.c, m68k/bdm-isv.c: Former BDM_TRAP now called BDM_TRAPNUM. * m68k/bdm-gdb.h, m68k/bdm-gdb.c: New files containing declarations and conversion functions for GDB's fileio protocol. * m68k/bdm-close.c: New file to define corresponding function. * m68k/bdm-fstat.c: Ditto. * m68k/bdm-gettimeofday.c: Ditto. * m68k/bdm-isatty.c: Ditto. * m68k/bdm-lseek.c: Ditto. * m68k/bdm-open.c: Ditto. * m68k/bdm-read.c: Ditto. * m68k/bdm-rename.c: Ditto. * m68k/bdm-stat.c: Ditto. * m68k/bdm-system.c: Ditto. * m68k/bdm-unlink.c: Ditto. * m68k/bdm-write.c Ditto. * m68k/Makefile.in: Add dependencies for new files. newlib/ Merge from newlib-csl-20060320-branch: 2006-05-22 Sandra Loosemore * configure.host: Tell it we have _rename and _system when building m68k-unknown-elf. --- libgloss/m68k/Makefile.in | 88 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 24 deletions(-) (limited to 'libgloss/m68k/Makefile.in') diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in index 8faf5ffcf..ad3f69fdf 100644 --- a/libgloss/m68k/Makefile.in +++ b/libgloss/m68k/Makefile.in @@ -118,12 +118,32 @@ IDPGDB_BSP= libidpgdb.a IDPGDB_OBJS= leds.o idp-inbyte.o idp-gdb-outbyte.o mc68ec.o # -# here's all the DBUG target stuff +# here's all the BDM semihosting stuff # -DBUG_BSP= libdbug.a -DBUG_OBJS= dbug-exit.o dbug-inbyte.o dbug-outbyte.o - -CF_SCRIPTS= m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld +BDM_CRT0= bdm-crt0.o +BDM_BSP= libbdm.a +BDM_OBJS= bdm-crt1.o bdm-semihost.o $(BDM_SYSOBJS) \ + $(patsubst %,bdm-%.o,${BDM_ISRS}) +BDM_OTHER_OBJS= getpid.o kill.o sbrk.o +BDM_SYSOBJS= bdm-close.o bdm-exit.o bdm-fstat.o bdm-gdb.o \ + bdm-gettimeofday.o bdm-isatty.o bdm-lseek.o \ + bdm-open.o bdm-read.o bdm-rename.o \ + bdm-stat.o bdm-system.o bdm-time.o bdm-unlink.o bdm-write.o +BDM_ISRS= other_interrupt reset access_error address_error \ + illegal_instruction divide_by_zero privilege_violation \ + trace unimplemented_line_a_opcode unimplemented_line_f_opcode \ + non_pc_breakpoint_debug_interrupt pc_breakpoint_debug_interrupt \ + format_error spurious_interrupt trap0 trap1 trap2 trap3 trap4 \ + trap5 trap6 trap7 trap8 trap9 trap10 trap11 trap12 trap13 trap14 \ + trap15 fp_branch_unordered fp_inexact_result fp_divide_by_zero \ + fp_underflow fp_operand_error fp_overflow fp_input_not_a_number \ + fp_input_denormalized_number unsupported_instruction + +CF_BOARDS := m5208evb m5213evb m52235evb m5235evb m5272c3 m5282evb \ + m5329evb m5485evb +CF_RAM_SCRIPTS := $(patsubst %,%-ram.ld,$(CF_BOARDS)) +CF_ROM_SCRIPTS := $(patsubst %,%-rom.ld,$(CF_BOARDS)) +CF_SCRIPTS= $(CF_RAM_SCRIPTS) $(CF_ROM_SCRIPTS) # Host specific makefile fragment comes in here. @host_makefile_frag@ @@ -132,7 +152,8 @@ CF_SCRIPTS= m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld # build a test program for each target board. Just trying to get # it to link is a good test, so we ignore all the errors for now. # -all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP} ${CF_SCRIPTS} +all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} \ + ${MVME135_BSP} ${MVME162_BSP} ${BDM_CRT0} ${BDM_BSP} ${CF_SCRIPTS} # # here's where we build the board support packages for each target @@ -153,8 +174,8 @@ ${IDPGDB_BSP}: $(OBJS) ${IDPGDB_OBJS} ${AR} ${ARFLAGS} $@ $(OBJS) ${IDPGDB_OBJS} ${RANLIB} $@ -${DBUG_BSP}: $(OBJS) ${DBUG_OBJS} - ${AR} ${ARFLAGS} $@ $(OBJS) ${DBUG_OBJS} +${BDM_BSP}: $(BDM_OTHER_OBJS) ${BDM_OBJS} + ${AR} ${ARFLAGS} $@ $(BDM_OTHER_OBJS) ${BDM_OBJS} ${RANLIB} $@ ${MVME135_BSP}: $(OBJS) ${MVME135_OBJS} @@ -165,20 +186,37 @@ ${MVME162_BSP}: $(OBJS) ${MVME162_OBJS} ${AR} ${ARFLAGS} $@ $(OBJS) ${MVME162_OBJS} ${RANLIB} $@ -m5208evb.ld: dbug-cf.sc Makefile - RAMSTART=1024M RAMSIZE=16M RAMDBUG=128K ${SHELL} $< > $@ - -m5213evb.ld: dbug-cf.sc Makefile - RAMSTART=512M RAMSIZE=32K RAMDBUG=8K ${SHELL} $< > $@ - -m5235evb.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@ - -m5272c3.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=4M RAMDBUG=128K ${SHELL} $< > $@ - -m5282evb.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@ +$(BDM_SYSOBJS): %.o: %.c bdm-semihost.h bdm-gdb.h + $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ +bdm-crt0.o : bdm-crt0.S + $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ +bdm-crt1.o : bdm-crt1.c + $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ +#We need to omit the frame pointer to ensure there is no prologue. +bdm-semihost.o : bdm-semihost.c + $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ -fomit-frame-pointer + +# We need to keep the frame pointer to make sure there's some +# prologue. Otherwise we get confused with the semihosting reoutine. +$(patsubst %,bdm-%.o,${BDM_ISRS}) : bdm-isrs.c + $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ \ + -DL_$(patsubst bdm-%.o,%,$@) -fno-omit-frame-pointer + +# RAM ROM +m5208evb := 1024M 16M 0M 2M +m5213evb := 512M 32K 0M 256K +m52235evb := 512M 32K 0M 256K +m5235evb := 0M 16M 0xFFE00000 2M +m5273c3 := 0M 4M 0xFFE00000 2M +m5282evb := 0M 16M 0xFFE00000 2M +m5329evb := 1024M 32M 0M 2M +m5485evb := 0M 64M 1024M 16M + +%-ram.ld : cf.sc Makefile + RAM=$(word 1,$($*)) RAM_SIZE=$(word 2,$($*)) ${SHELL} $< >$@ +%-rom.ld : cf.sc Makefile + RAM=$(word 1,$($*)) RAM_SIZE=$(word 2,$($*)) \ + ROM=$(word 3,$($*)) ROM_SIZE=$(word 4,$($*)) ${SHELL} $< >$@ leds.o: ${srcdir}/leds.c $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< @@ -296,8 +334,10 @@ install: # install MVME162lx stuff $(INSTALL_PROGRAM) $(MVME162_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(MVME162_BSP) $(INSTALL_DATA) ${srcdir}/mvme162.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/mvme162.ld - # install DBUG stuff - $(INSTALL_PROGRAM) $(DBUG_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(DBUG_BSP) + # install BDM stuff + $(INSTALL_PROGRAM) $(BDM_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(BDM_CRT0) + $(INSTALL_PROGRAM) $(BDM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(BDM_BSP) + $(INSTALL_DATA) ${srcdir}/sbc5204.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5204.ld $(INSTALL_DATA) ${srcdir}/sbc5206.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5206.ld for script in $(CF_SCRIPTS) ; \ -- cgit v1.2.3