diff options
Diffstat (limited to 'misc/buildroot/toolchain')
| -rw-r--r-- | misc/buildroot/toolchain/dependencies/dependencies.mk | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/gcc/Makefile.in | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/Makefile | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/arm/disarm.c | 80 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/ldnxflat.c | 26 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/mknxflat.c | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/nxflat.h | 4 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/readnxflat.c | 4 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def | 2 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/sstrip/sstrip.c | 10 |
11 files changed, 68 insertions, 68 deletions
diff --git a/misc/buildroot/toolchain/dependencies/dependencies.mk b/misc/buildroot/toolchain/dependencies/dependencies.mk index 507132c70..8fa740d42 100644 --- a/misc/buildroot/toolchain/dependencies/dependencies.mk +++ b/misc/buildroot/toolchain/dependencies/dependencies.mk @@ -5,7 +5,7 @@ # ###################################################################### -dependencies: +dependencies: @HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" $(TOPDIR)/toolchain/dependencies/dependencies.sh dependencies-source: diff --git a/misc/buildroot/toolchain/gcc/Makefile.in b/misc/buildroot/toolchain/gcc/Makefile.in index 0329c199f..028484423 100644 --- a/misc/buildroot/toolchain/gcc/Makefile.in +++ b/misc/buildroot/toolchain/gcc/Makefile.in @@ -1,4 +1,4 @@ -# +# GCC_VERSION:=$(strip $(subst ",, $(BR2_GCC_VERSION))) #")) diff --git a/misc/buildroot/toolchain/nxflat/Makefile b/misc/buildroot/toolchain/nxflat/Makefile index 8707ba0c1..7cffc3ab0 100644 --- a/misc/buildroot/toolchain/nxflat/Makefile +++ b/misc/buildroot/toolchain/nxflat/Makefile @@ -35,7 +35,7 @@ CFLAGS += -Wall -I. -I$(BINUTILS_DIR1)/bfd -I$(BINUTILS_DIR)/include LDFLAGS += -L$(BINUTILS_DIR1)/bfd -L$(BINUTILS_DIR1)/libiberty -LIBS = -lbfd -liberty -lz -lc +LIBS = -lbfd -liberty -lz -lc LDNXFLAT_OBJS = ldnxflat.o MKNXFLAT_OBJS = mknxflat.o diff --git a/misc/buildroot/toolchain/nxflat/arm/disarm.c b/misc/buildroot/toolchain/nxflat/arm/disarm.c index c1d8257de..9fc810e66 100644 --- a/misc/buildroot/toolchain/nxflat/arm/disarm.c +++ b/misc/buildroot/toolchain/nxflat/arm/disarm.c @@ -81,7 +81,7 @@ static unsigned int regname_selected = 1; static char * arm_fp_const[] = {"0.0", "1.0", "2.0", "3.0", "4.0", "5.0", "0.5", "10.0"}; -static char * arm_shift[] = +static char * arm_shift[] = {"lsl", "lsr", "asr", "ror"}; static struct arm_opcode arm_opcodes[] = @@ -105,7 +105,7 @@ static struct arm_opcode arm_opcodes[] = {0x0c400000, 0x0ff00fff, "mar%c\tacc0, %12-15r, %16-19r"}, {0x0c500000, 0x0ff00fff, "mra%c\t%12-15r, %16-19r, acc0"}, {0xf450f000, 0xfc70f000, "pld\t%a"}, - + /* V5 Instructions. */ {0xe1200070, 0xfff000f0, "bkpt\t0x%16-19X%12-15X%8-11X%0-3X"}, {0xfa000000, 0xfe000000, "blx\t%B"}, @@ -117,7 +117,7 @@ static struct arm_opcode arm_opcodes[] = {0xfe000010, 0xff100010, "mcr2\t%8-11d, %21-23d, %12-15r, cr%16-19d, cr%0-3d, {%5-7d}"}, {0xfe100010, 0xff100010, "mrc2\t%8-11d, %21-23d, %12-15r, cr%16-19d, cr%0-3d, {%5-7d}"}, - /* V5E "El Segundo" Instructions. */ + /* V5E "El Segundo" Instructions. */ {0x000000d0, 0x0e1000f0, "ldr%cd\t%12-15r, %s"}, {0x000000f0, 0x0e1000f0, "str%cd\t%12-15r, %s"}, {0x01000080, 0x0ff000f0, "smlabb%c\t%16-19r, %0-3r, %8-11r, %12-15r"}, @@ -304,7 +304,7 @@ static struct arm_opcode arm_opcodes[] = {0x0d100400, 0x0f500f00, "cfldrs%c\tmvf%12-15d, %A"}, {0x0c100400, 0x0f500f00, "cfldrs%c\tmvf%12-15d, %A"}, {0x0d500400, 0x0f500f00, "cfldrd%c\tmvd%12-15d, %A"}, - {0x0c500400, 0x0f500f00, "cfldrd%c\tmvd%12-15d, %A"}, + {0x0c500400, 0x0f500f00, "cfldrd%c\tmvd%12-15d, %A"}, {0x0d100500, 0x0f500f00, "cfldr32%c\tmvfx%12-15d, %A"}, {0x0c100500, 0x0f500f00, "cfldr32%c\tmvfx%12-15d, %A"}, {0x0d500500, 0x0f500f00, "cfldr64%c\tmvdx%12-15d, %A"}, @@ -406,14 +406,14 @@ static inline void print_address(FILE *stream, u_int32_t offset) static void arm_decode_shift(u_int32_t given, FILE *stream) { fprintf(stream, "%s", arm_regnames[given & 0xf]); - + if ((given & 0xff0) != 0) { if ((given & 0x10) == 0) { int amount = (given & 0xf80) >> 7; int shift = (given & 0x60) >> 5; - + if (amount == 0) { if (shift == 3) @@ -421,10 +421,10 @@ static void arm_decode_shift(u_int32_t given, FILE *stream) fprintf(stream, ", rrx"); return; } - + amount = 32; } - + fprintf(stream, ", %s #%d", arm_shift[shift], amount); } else @@ -442,7 +442,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) if ((given & insn->mask) == insn->value) { char * c; - + for (c = insn->assembler; *c; c++) { if (*c == '%') @@ -458,14 +458,14 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) && ((given & 0x02000000) == 0)) { int offset = given & 0xfff; - + fprintf(stream, "[pc"); - + if (given & 0x01000000) { if ((given & 0x00800000) == 0) offset = - offset; - + /* Pre-indexed. */ fprintf(stream, ", #%d]", offset); @@ -486,13 +486,13 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) /* ie ignore the offset. */ offset = pc + 8; } - + fprintf(stream, "\t; "); print_address(stream, offset); } else { - fprintf(stream, "[%s", + fprintf(stream, "[%s", arm_regnames[(given >> 16) & 0xf]); if ((given & 0x01000000) != 0) { @@ -512,7 +512,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) arm_decode_shift (given, stream); } - fprintf(stream, "]%s", + fprintf(stream, "]%s", ((given & 0x00200000) != 0) ? "!" : ""); } else @@ -524,13 +524,13 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) fprintf(stream, "], %s#%d", (((given & 0x00800000) == 0) ? "-" : ""), offset); - else + else fprintf(stream, "]"); } else { fprintf(stream, "], %s", - (((given & 0x00800000) == 0) + (((given & 0x00800000) == 0) ? "-" : "")); arm_decode_shift (given, stream); } @@ -543,17 +543,17 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) { /* PC relative with immediate offset. */ int offset = ((given & 0xf00) >> 4) | (given & 0xf); - + if ((given & 0x00800000) == 0) offset = -offset; - + fprintf(stream, "[pc, #%d]\t; ", offset); - + print_address(stream, offset + pc + 8); } else { - fprintf(stream, "[%s", + fprintf(stream, "[%s", arm_regnames[(given >> 16) & 0xf]); if ((given & 0x01000000) != 0) { @@ -576,7 +576,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) arm_regnames[given & 0xf]); } - fprintf(stream, "]%s", + fprintf(stream, "]%s", ((given & 0x00200000) != 0) ? "!" : ""); } else @@ -590,7 +590,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) fprintf(stream, "], %s#%d", (((given & 0x00800000) == 0) ? "-" : ""), offset); - else + else fprintf(stream, "]"); } else @@ -604,7 +604,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) } } break; - + case 'b': print_address(stream, BDISP (given) * 4 + pc + 8); break; @@ -802,7 +802,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) } break; - case '0': case '1': case '2': case '3': case '4': + case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': { int bitstart = *c++ - '0'; @@ -814,44 +814,44 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) { case '-': c++; - + while (*c >= '0' && *c <= '9') bitend = (bitend * 10) + *c++ - '0'; - + if (!bitend) return -1; - + switch (*c) { case 'r': { int32_t reg; - + reg = given >> bitstart; reg &= (2 << (bitend - bitstart)) - 1; - + fprintf(stream, "%s", arm_regnames[reg]); } break; case 'd': { int32_t reg; - + reg = given >> bitstart; reg &= (2 << (bitend - bitstart)) - 1; - + fprintf(stream, "%d", reg); } break; case 'x': { int32_t reg; - + reg = given >> bitstart; reg &= (2 << (bitend - bitstart)) - 1; - + fprintf(stream, "0x%08x", reg); - + /* Some SWI instructions have special meanings. */ if ((given & 0x0fffffff) == 0x0FF00000) @@ -863,20 +863,20 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) case 'X': { int32_t reg; - + reg = given >> bitstart; reg &= (2 << (bitend - bitstart)) - 1; - + fprintf(stream, "%01x", reg & 0xf); } break; case 'f': { int32_t reg; - + reg = given >> bitstart; reg &= (2 << (bitend - bitstart)) - 1; - + if (reg > 7) fprintf(stream, "#%s", arm_fp_const[reg & 7]); @@ -937,7 +937,7 @@ int print_insn_arm(u_int32_t pc, FILE *stream, u_int32_t given) } break; - + default: return -1; } diff --git a/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def b/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def index 8a42e6486..97fc4080a 100644 --- a/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def +++ b/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def @@ -77,7 +77,7 @@ static const char import_prologue[] = ""; * Import Function Name String Table *******************************************************************/ -static const char import_name_strtab_prologue[] = +static const char import_name_strtab_prologue[] = "\n/*******************************************************************\n" " * Import Function Names\n" " *******************************************************************/\n\n" diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c index c1c2ff49b..92af6f767 100644 --- a/misc/buildroot/toolchain/nxflat/ldnxflat.c +++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c @@ -2,7 +2,7 @@ * toolchain/nxflat/ldnxflat.c * Convert ELF (or any BFD format) to NXFLAT binary format * - * ldnxflat takes a fully resolvable elf binary which was linked with -r + * ldnxflat takes a fully resolvable elf binary which was linked with -r * and resolves all references, then generates relocation table entries for * any relocation entries in data sections. This is designed to work with * the options -fpic -msingle-pic-base (and -mno-got or -membedded-pic, but @@ -42,7 +42,7 @@ * (c) 1996, 1997 Dionne & Associates * jeff@ryeham.ee.ryerson.ca * - * Relocation added March 1997, Kresten Krab Thorup + * Relocation added March 1997, Kresten Krab Thorup * krab@california.daimi.aau.dk * * This program is free software; you can redistribute it and/or modify @@ -183,7 +183,7 @@ typedef struct } tc_data; - /* Version information. This is from an Elf_Internal_Versym structure in a + /* Version information. This is from an Elf_Internal_Versym structure in a * SHT_GNU_versym section. It is zero if there is no version information. */ u_int16_t version; @@ -692,7 +692,7 @@ static int get_reloc_type(asection *sym_section, segment_info **sym_segment) /* Yes... */ vdbg("Sym section %s is BSS\n", sym_section->name); - + if (sym_segment) { *sym_segment = &bss_info; @@ -984,7 +984,7 @@ relocate_abs32(arelent *relp, int32_t *target, symvalue sym_value) else { /* Reallocation was successful. Update globals */ - + nxflat_nrelocs++; nxflat_relocs = relocs; @@ -992,7 +992,7 @@ relocate_abs32(arelent *relp, int32_t *target, symvalue sym_value) nxflat_relocs[nxflat_nrelocs-1].r_info = NXFLAT_RELOC(reloc_type, relp->address + got_size); - + vdbg("relocs[%d]: type: %d offset: %08x\n", nxflat_nrelocs-1, NXFLAT_RELOC_TYPE(nxflat_relocs[nxflat_nrelocs-1].r_info), @@ -1305,7 +1305,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms) * constant strings in D-Space. I think we can just ignore * this relocation. The usual assembly language sequence * is like: - * + * * ldr r0, .L9 <- r0 holds GOT-relative offset to 'n' * add r0, sl, r0 <- Adding SL produces address of 'n' * ... @@ -1323,7 +1323,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms) */ /* Check if symbols lies in I- or D-Space */ - + reltype = get_reloc_type(rel_section, NULL); if (reltype == NXFLAT_RELOC_TARGET_TEXT) { @@ -1349,7 +1349,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms) * offset table. This relocation type is used to set the 32-bit * address of global variables. The usual assembly language sequence * is like: - * + * * ldr r3, .L4 <- r3 holds GOT-relative offset to address of 'n' * ldr r1, [sl,r3] <- r1 holds (relocated) address of 'n' * ... @@ -1385,9 +1385,9 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms) dbg("Performing GOTPC reloc at addr %08lx [%08lx] to sym '%s' [%08lx]\n", (long)relpp[j]->address, (long)*target, rel_sym->name, (long)sym_value); - + /* Check if this is TEXT section relocation */ - + if ((inf->subsect[i]->flags & SEC_CODE) != 0 && (inf->subsect[i]->flags & SEC_ALLOC) != 0) { @@ -1928,7 +1928,7 @@ static void output_got(int fd) /* And output the relocation information associate with the GOT entry */ relocs[j].r_info = NXFLAT_RELOC(reloc_type, sizeof(u_int32_t) * i); - + vdbg("relocs[%d]: type: %d offset: %08x\n", j, NXFLAT_RELOC_TYPE(relocs[j].r_info), NXFLAT_RELOC_OFFSET(relocs[j].r_info)); } @@ -2215,7 +2215,7 @@ int main(int argc, char **argv, char **envp) symbol_table = get_symbols(bf, &number_of_symbols); - /* Find all of the special symbols that we will need in the symbol table that + /* Find all of the special symbols that we will need in the symbol table that * we just read. */ find_special_symbols(); diff --git a/misc/buildroot/toolchain/nxflat/mknxflat.c b/misc/buildroot/toolchain/nxflat/mknxflat.c index 5387d385b..7a66280bb 100644 --- a/misc/buildroot/toolchain/nxflat/mknxflat.c +++ b/misc/buildroot/toolchain/nxflat/mknxflat.c @@ -517,7 +517,7 @@ static int get_file_token(FILE * in_stream) if (c == EOF) return EOF; - /* Add the token to the buffer. Copy characters until the buffer is full, or + /* Add the token to the buffer. Copy characters until the buffer is full, or * a terminator is encountered. */ for (i = 0; ((i < 1023) && !ISTERMINATOR(c)); i++, c = getc(in_stream)) diff --git a/misc/buildroot/toolchain/nxflat/nxflat.h b/misc/buildroot/toolchain/nxflat/nxflat.h index ff41a733d..e4cbdd8f6 100644 --- a/misc/buildroot/toolchain/nxflat/nxflat.h +++ b/misc/buildroot/toolchain/nxflat/nxflat.h @@ -90,7 +90,7 @@ struct nxflat_hdr_s * and bss regions (bss_end - data_start) as well as the size of the * stack. At run time, this region will also include program arguments * and environement variables. - * + * * The bss segment is data_end through bss_end. */ @@ -186,7 +186,7 @@ struct nxflat_reloc_s #define NXFLAT_RELOC_TYPE_NUM 2 /* Number of relocation types */ /**************************************************************************** - * NXFLAT Imported symbol type + * NXFLAT Imported symbol type * * The imported symbols are an array of the following type. The fields * in each element are stored in native machine order. diff --git a/misc/buildroot/toolchain/nxflat/readnxflat.c b/misc/buildroot/toolchain/nxflat/readnxflat.c index e19e2d699..e39a02053 100644 --- a/misc/buildroot/toolchain/nxflat/readnxflat.c +++ b/misc/buildroot/toolchain/nxflat/readnxflat.c @@ -67,7 +67,7 @@ /*********************************************************************** * Definitions ***********************************************************************/ - + #define NXFLAT_HDR_SIZE sizeof(struct nxflat_hdr_s) /*********************************************************************** @@ -456,7 +456,7 @@ static void dump_relocation_entries(FILE * in_stream, struct nxflat_hdr_s *heade } exit(1); } - + #ifdef RELOCS_IN_NETWORK_ORDER { u_int32_t *ptmp; diff --git a/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def b/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def index 865536c50..5d4b81c12 100644 --- a/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def +++ b/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def @@ -79,7 +79,7 @@ static const char import_prologue[] = ""; * Import Function Name String Table *******************************************************************/ -static const char import_name_strtab_prologue[] = +static const char import_name_strtab_prologue[] = "\n/*******************************************************************\n" " * Import Function Names\n" " *******************************************************************/\n\n" diff --git a/misc/buildroot/toolchain/sstrip/sstrip.c b/misc/buildroot/toolchain/sstrip/sstrip.c index 1842f053c..ae0c67a67 100644 --- a/misc/buildroot/toolchain/sstrip/sstrip.c +++ b/misc/buildroot/toolchain/sstrip/sstrip.c @@ -12,7 +12,7 @@ * * sstrip is a small utility that removes the contents at the end of an * ELF file that are not part of the program's memory image. - * + * * Most ELF executables are built with both a program header table and a * section header table. However, only the former is required in order * for the OS to load, link and execute a program. sstrip attempts to @@ -21,7 +21,7 @@ * the file that occur at the end, after the parts to be saved. However, * this almost always includes the section header table, and occasionally * a few random sections that are not used when running a program. - * + * * It should be noted that the GNU bfd library is (understandably) * dependent on the section header table as an index to the file's * contents. Thus, an executable file that has no section header table @@ -33,15 +33,15 @@ * low-priority item, as executables without a section header table are * rare in the extreme.) This probably also explains why strip doesn't * offer the option to do this. - * + * * Shared library files may also have their section header table removed. * Such a library will still function; however, it will no longer be * possible for a compiler to link a new program against it. - * + * * As an added bonus, sstrip also tries to removes trailing zero bytes * from the end of the file. (This normally cannot be done with an * executable that has a section header table.) - * + * * sstrip is a very simplistic program. It depends upon the common * practice of putting the parts of the file that contribute to the * memory image at the front, and the remaining material at the end. This |