Skip to content

Commit

Permalink
Various typos and trivia.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbeaudoin committed Jan 27, 2017
1 parent 252f15a commit 00f30cb
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion contrib/fiveam-1.2/src/check.lisp
Expand Up @@ -83,7 +83,7 @@ creates a TEST-PASSED or TEST-FAILURE object."))
()
(:documentation "A test which was not run. Usually this is due
to unsatisfied dependencies, but users can decide to skip test
when appropiate."))
when appropriate."))

(defgeneric test-skipped-p (object)
(:method ((o t)) nil)
Expand Down
5 changes: 4 additions & 1 deletion contrib/tinycc/mkcc.c
Expand Up @@ -2,6 +2,7 @@
* MKCC - Tiny C Compiler
*
* Copyright (c) 2001-2004 Fabrice Bellard
* Copyright (c) 2017 Jean-Claude Beaudoin
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -82,7 +83,9 @@ static void display_info(MKCCState *s, int what)

static void help(void)
{
printf("Tiny C Compiler "MKCC_VERSION" - Copyright (C) 2001-2006 Fabrice Bellard\n"
printf("ManKai tiny C Compiler "MKCC_VERSION"\n"
" - Copyright (C) 2001-2006 Fabrice Bellard et al.\n"
" - Copyright (C) 2016-2017 Jean-Claude Beaudoin.\n"
"Usage: mkcc [options...] [-o outfile] [-c] infile(s)...\n"
" mkcc [options...] -run infile [arguments...]\n"
"General options:\n"
Expand Down
4 changes: 2 additions & 2 deletions contrib/tinycc/mkccelf.c
Expand Up @@ -595,7 +595,7 @@ ST_FUNC void relocate_section(MKCCState *s1, Section *s)
{
int x, is_thumb, is_call, h, blx_avail, is_bl, th_ko;
x = (*(int *) ptr) & 0xffffff;
if (sym->st_shndx == SHN_UNDEF || s1->output_type == TCC_OUTPUT_MEMORY)
if (sym->st_shndx == SHN_UNDEF || s1->output_type == MKCC_OUTPUT_MEMORY)
val = s1->plt->sh_addr;
#ifdef DEBUG_RELOC
printf ("reloc %d: x=0x%x val=0x%x ", type, x, val);
Expand Down Expand Up @@ -1332,7 +1332,7 @@ ST_FUNC void build_got_entries(MKCCState *s1)
sym_index = ELFW(R_SYM)(rel->r_info);
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
if (type != R_ARM_GOTOFF && type != R_ARM_GOTPC
&& (sym->st_shndx == SHN_UNDEF || s1->output_type == TCC_OUTPUT_MEMORY)) {
&& (sym->st_shndx == SHN_UNDEF || s1->output_type == MKCC_OUTPUT_MEMORY)) {
unsigned long ofs;
/* look at the symbol got offset. If none, then add one */
if (type == R_ARM_GOT32)
Expand Down
2 changes: 2 additions & 0 deletions src/aclocal.m4
Expand Up @@ -25,6 +25,7 @@ int main() {
x <<= 1;
}
fprintf(f,"MKCL_LONG_LONG_BITS='%d'",bits);
fclose(f);
exit(0);
}]])],[eval "`cat conftestval`"],[],[])
fi
Expand Down Expand Up @@ -721,6 +722,7 @@ int main() {
}
fprintf(f,"CL_LONG_BITS='%d'",bits);
}
fclose(f);
exit(0);
}]])],[eval "`cat conftestval`"],[],[])
fi
Expand Down
2 changes: 1 addition & 1 deletion src/c/pathname.d
Expand Up @@ -966,7 +966,7 @@ mkcl_coerce_to_file_pathname(MKCL, mkcl_object pathname)

/*
* mkcl_coerce_to_physical_pathname(P) converts P to a physical pathname,
* performing the appropiate transformation if P was a logical pathname.
* performing the appropriate transformation if P was a logical pathname.
*/
mkcl_object
mkcl_coerce_to_physical_pathname(MKCL, mkcl_object x)
Expand Down
2 changes: 2 additions & 0 deletions src/configure
Expand Up @@ -5676,6 +5676,7 @@ int main() {
x <<= 1;
}
fprintf(f,"MKCL_LONG_LONG_BITS='%d'",bits);
fclose(f);
exit(0);
}
_ACEOF
Expand Down Expand Up @@ -6001,6 +6002,7 @@ int main() {
}
fprintf(f,"CL_LONG_BITS='%d'",bits);
}
fclose(f);
exit(0);
}
_ACEOF
Expand Down
2 changes: 1 addition & 1 deletion src/configure.in
Expand Up @@ -569,7 +569,7 @@ dnl CFLAGS="${CFLAGS} -fstrict-aliasing"
dnl fi

dnl ----------------------------------------------------------------------
dnl Check the appropiate type for cl_fixnum/cl_index
dnl Check the appropriate type for cl_fixnum/cl_index
MKCL_FIXNUM_TYPE
MKCL_INTEGER_TYPES

Expand Down

0 comments on commit 00f30cb

Please sign in to comment.