From 0a0f33e50135e3e106e9e81152a41aa99268970d Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Sun, 27 Jul 2014 14:37:10 +0000 Subject: [PATCH] Add moxiebox support. --- libgloss/ChangeLog | 7 ++ libgloss/moxie/Makefile.in | 16 ++- libgloss/moxie/configure.in | 15 +++ libgloss/moxie/moxiebox.ld | 232 ++++++++++++++++++++++++++++++++++++ newlib/ChangeLog | 4 + newlib/configure.host | 9 +- 6 files changed, 276 insertions(+), 7 deletions(-) create mode 100644 libgloss/moxie/moxiebox.ld diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index db3820cf2..eea9cb63c 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2014-07-27 Anthony Green + + * moxie/Makefile.in (LD_SCRIPTS): Add moxiebox.ld + Conditionally build and install crt0.o. + * moxie/configure.in: Don't build crt0.o for moxiebox. + * moxie/moxiebox.ld: New file. + 2014-07-16 Kyrylo Tkachov * arm/elf-aprofile-validation.specs (*link): Make text segment diff --git a/libgloss/moxie/Makefile.in b/libgloss/moxie/Makefile.in index a6ca86c8c..9aba6b4ce 100644 --- a/libgloss/moxie/Makefile.in +++ b/libgloss/moxie/Makefile.in @@ -58,9 +58,13 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ then echo ${objroot}/../binutils/objcopy ; \ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` -LD_SCRIPTS = moxie-elf-common.ld qemu.ld sim.ld +LD_SCRIPTS = moxie-elf-common.ld qemu.ld sim.ld moxiebox.ld + +@BUILD_CRT0_TRUE@CRT0 = crt0.o +@BUILD_CRT0_TRUE@CRT0_INSTALL = install-crt0 +@BUILD_CRT0_FALSE@CRT0 = +@BUILD_CRT0_FALSE@CRT0_INSTALL = -CRT0 = crt0.o SIM_BSP = libsim.a SIM_OBJS = fstat.o \ getpid.o \ @@ -96,7 +100,7 @@ QEMU_OBJS = qemu-write.o \ #### Host specific Makefile fragment comes in here. @host_makefile_frag@ -all: $(CRT0) $(SIM_BSP) $(QEMU_BSP) +all: ${CRT0} $(SIM_BSP) $(QEMU_BSP) $(SIM_BSP): $(SIM_OBJS) $(AR) $(ARFLAGS) $@ $? @@ -124,14 +128,16 @@ sim-write.o: $(srcdir)/sim-write.S stat.o: $(srcdir)/stat.c qemu-write.o: $(srcdir)/qemu-write.c -install: $($(CPU)_INSTALL) - $(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0) +install: ${CRT0_INSTALL} $($(CPU)_INSTALL) $(INSTALL_DATA) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP) $(INSTALL_DATA) $(QEMU_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(QEMU_BSP) for x in ${LD_SCRIPTS}; do \ ${INSTALL_DATA} ${srcdir}/$$x $(DESTDIR)${tooldir}/lib/$$x; \ done; +install-crt0: + ${INSTALL_DATA} ${CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x + clean mostlyclean: rm -f *.o *.a diff --git a/libgloss/moxie/configure.in b/libgloss/moxie/configure.in index 04169f1b5..e3b5d1426 100644 --- a/libgloss/moxie/configure.in +++ b/libgloss/moxie/configure.in @@ -33,6 +33,21 @@ AC_SUBST(LD) AC_PROG_RANLIB LIB_AM_PROG_AS +dnl Don't build crt0 for moxiebox, which provides crt0 for us. +case "${target}" in + moxie-*-moxiebox*) + BUILD_CRT0_TRUE='#' + BUILD_CRT0_FALSE= + ;; + *) + BUILD_CRT0_TRUE= + BUILD_CRT0_FALSE='#' + ;; +esac + +AC_SUBST(BUILD_CRT0_TRUE) +AC_SUBST(BUILD_CRT0_FALSE) + host_makefile_frag=${srcdir}/../config/default.mh dnl We have to assign the same value to other variables because autoconf diff --git a/libgloss/moxie/moxiebox.ld b/libgloss/moxie/moxiebox.ld new file mode 100644 index 000000000..0828e8978 --- /dev/null +++ b/libgloss/moxie/moxiebox.ld @@ -0,0 +1,232 @@ +/* + * Default linker script for moxiebox. + * + * Copyright (C) 2014 Anthony Green + * + * The authors hereby grant permission to use, copy, modify, + * distribute, and license this software and its documentation for any + * purpose, provided that existing copyright notices are retained in + * all copies and that this notice is included verbatim in any + * distributions. No written agreement, license, or royalty fee is + * required for any of the authorized uses. Modifications to this + * software may be copyrighted by their authors and need not follow + * the licensing terms described here, provided that the new terms are + * clearly indicated on the first page of each file where they apply. + */ + +OUTPUT_FORMAT("moxiebox") +OUTPUT_ARCH(moxie) +ENTRY(_start) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = 0x00001000; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rel.init : { *(.rel.init) } + .rela.init : { *(.rela.init) } + .rel.text : + { + *(.rel.text) + *(.rel.text.*) + *(.rel.gnu.linkonce.t*) + } + .rela.text : + { + *(.rela.text) + *(.rela.text.*) + *(.rela.gnu.linkonce.t*) + } + .rel.fini : { *(.rel.fini) } + .rela.fini : { *(.rela.fini) } + .rel.rodata : + { + *(.rel.rodata) + *(.rel.rodata.*) + *(.rel.gnu.linkonce.r*) + } + .rela.rodata : + { + *(.rela.rodata) + *(.rela.rodata.*) + *(.rela.gnu.linkonce.r*) + } + .rel.data : + { + *(.rel.data) + *(.rel.data.*) + *(.rel.gnu.linkonce.d*) + } + .rela.data : + { + *(.rela.data) + *(.rela.data.*) + *(.rela.gnu.linkonce.d*) + } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.sdata : + { + *(.rel.sdata) + *(.rel.sdata.*) + *(.rel.gnu.linkonce.s*) + } + .rela.sdata : + { + *(.rela.sdata) + *(.rela.sdata.*) + *(.rela.gnu.linkonce.s*) + } + .rel.sbss : { *(.rel.sbss) } + .rela.sbss : { *(.rela.sbss) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .plt : { *(.plt) } + .text : + { + *(.text) + *(.text.*) + *(.stub) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + *(.glue_7t) *(.glue_7) + } =0 + .init : + { + KEEP (*(.init)) + } =0 + _etext = .; + PROVIDE (etext = .); + .fini : + { + KEEP (*(.fini)) + } =0 + .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r*) } + .rodata1 : { *(.rodata1) } + .eh_frame_hdr : { *(.eh_frame_hdr) } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + . = ALIGN(256) + (. & (256 - 1)); + .data : + { + *(.data) + *(.data.*) + *(.gnu.linkonce.d*) + SORT(CONSTRUCTORS) + } + .data1 : { *(.data1) } + .eh_frame : { KEEP (*(.eh_frame)) } + .gcc_except_table : { *(.gcc_except_table) } + .ctors : + { + /* gcc uses crtbegin.o to find the start of + the constructors, so we make sure it is + first. Because this is a wildcard, it + doesn't matter if the user does not + actually link against crtbegin.o; the + linker won't look for a file to match a + wildcard. The wildcard also means that it + doesn't matter which directory crtbegin.o + is in. */ + KEEP (*crtbegin.o(.ctors)) + /* We don't want to include the .ctor section from + from the crtend.o file until after the sorted ctors. + The .ctor section from the crtend file contains the + end of ctors marker and it must be last */ + KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + } + .dtors : + { + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + } + .jcr : { KEEP (*(.jcr)) } + .got : { *(.got.plt) *(.got) } + .dynamic : { *(.dynamic) } + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : + { + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + } + _edata = .; + PROVIDE (edata = .); + __bss_start = .; + __bss_start__ = .; + .sbss : + { + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.scommon) + } + .bss : + { + *(.dynbss) + *(.bss) + *(.bss.*) + *(COMMON) + /* Align here to ensure that the .bss section occupies space up to + _end. Align after .bss to ensure correct alignment even if the + .bss section disappears because there are no input sections. */ + . = ALIGN(32 / 8); + } + . = ALIGN(32 / 8); + _end = .; + _bss_end__ = . ; __bss_end__ = . ; __end__ = . ; + PROVIDE (end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + .debug_ranges 0 : { *(.debug_ranges) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 50e0f04e2..1255ad0ba 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2014-07-27 Anthony Green + + * configure.host: Add moxie-*-moxiebox target. + 2014-07-22 Joel Sherrill * libc/include/sys/time.h: Add prototype for adjtime() and diff --git a/newlib/configure.host b/newlib/configure.host index 39eb0fb2b..447f1c188 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -176,7 +176,7 @@ case "${host_cpu}" in machine_dir=lm32 ;; m32c) - machine_dir=m32c + machine_dir=m32c newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -DSMALL_MEMORY" ;; @@ -731,10 +731,15 @@ case "${host}" in mn10?00-*-*) syscall_dir=syscalls ;; - moxie-*-*) + moxie-*-elf* | moxie-*-rtems*) syscall_dir=syscalls default_newlib_io_long_long="yes" ;; + moxie-*-moxiebox) + syscall_dir=syscalls + default_newlib_io_long_long="yes" + newlib_cflags="${newlib_cflags} -Os -DPREFER_SIZE_OVER_SPEED -DSMALL_MEMORY" + ;; nios2*) syscall_dir= newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_SYSTEM -DMISSING_SYSCALL_NAMES"