Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/kmkbuiltin/cmp_util.c

    r2113 r2591  
    363363
    364364        bytes_read = read(fd1, b1, blk_sz);
    365         if (bytes_read != blk_sz)
     365        if (bytes_read != (off_t)blk_sz)
    366366            goto l_read_error;
    367367
    368368        bytes_read = read(fd2, b2, blk_sz);
    369         if (bytes_read != blk_sz)
     369        if (bytes_read != (off_t)blk_sz)
    370370            goto l_read_error;
    371371

  • trunk/src/kmk/kmkbuiltin/darwin.c

    r2413 r2591  
    2929#include "config.h"
    3030#include <sys/stat.h>
     31#include <sys/time.h>
    3132#include <unistd.h>
    3233

  • trunk/src/kmk/kmkbuiltin/echo.c

    r2113 r2591  
    3939#endif /* not lint */
    4040#include <sys/cdefs.h>
    41 //__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.17 2004/04/06 20:06:46 markm Exp $");
     41/*__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.17 2004/04/06 20:06:46 markm Exp $");*/
    4242#endif
    4343

  • trunk/src/kmk/kmkbuiltin/expr.c

    r2121 r2591  
    281281}
    282282
     283#ifdef __GNUC__
     284__attribute__((noreturn))
     285#endif
    283286static void
    284287error(void)

  • trunk/src/kmk/kmkbuiltin/kDepObj.c

    r2413 r2591  
    274274
    275275        /* process selected record types. */
    276         dprintf(("%#07x: %#04x %#05x\n", (const KU8*)pHdr - pbFile, pHdr->bType, pHdr->cbRec));
     276        dprintf(("%#07" KUPTR_PRI ": %#04x %#05x\n", (const KU8*)pHdr - pbFile, pHdr->bType, pHdr->cbRec));
    277277        switch (pHdr->bType)
    278278        {
    … …  
    692692        if (off + 8 > cbSrcFiles)
    693693        {
    694             fprintf(stderr, "%s: CV source file entry at %08" KX32_PRI " is too long; cbSrcFiles=%#" KSIZE_PRI "\n",
     694            fprintf(stderr, "%s: CV source file entry at %08" KX32_PRI " is too long; cbSrcFiles=%#" KX32_PRI "\n",
    695695                    argv0, off, cbSrcFiles);
    696696            return 1;
    … …  
    701701        if (off + cbSrc > cbSrcFiles)
    702702        {
    703             fprintf(stderr, "%s: CV source file entry at %08" KX32_PRI " is too long; cbSrc=%#" KX32_PRI " cbSrcFiles=%#" KSIZE_PRI "\n",
     703            fprintf(stderr, "%s: CV source file entry at %08" KX32_PRI " is too long; cbSrc=%#" KX32_PRI " cbSrcFiles=%#" KX32_PRI "\n",
    704704                    argv0, off, cbSrc, cbSrcFiles);
    705705            return 1;

  • trunk/src/kmk/kmkbuiltin/kbuild_version.c

    r2413 r2591  
    5353
    5454    printf("%.*s - kBuild version %d.%d.%d (r%u)\n",
    55            tmp - argv0, argv0,
     55           (int)(tmp - argv0), argv0,
    5656           KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH,
    5757           KBUILD_SVN_REV);

  • trunk/src/kmk/kmkbuiltin/printf.c

    r2141 r2591  
    207207        (void)funcname;
    208208        if (rc != 0)
    209                 fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
     209                fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
    210210        return o;
    211211}
Note: See TracChangeset for help on using the changeset viewer.