Changeset 3062 for trunk


Ignore:
Timestamp:
Sep 30, 2017, 1:26:21 PM (8 years ago)
Author:
bird
Message:

netbsd patches from Uwe. Messing around on arm (arm -> arm32, adding arm64); Adding GNU/kFreeBSD and GNU/kNetBSD to the OS list. Added SuperH to archs. Recognize ppc64le as ppc64 in env.sh. Misc.

Location:
trunk
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r2870 r3062  
    373373TEMPLATE_BIN-THREADED_EXTENDS = BIN
    374374TEMPLATE_BIN-THREADED_EXTENDS_BY = appending
    375 if1of ($(KBUILD_TARGET), dragonfly freebsd linux openbsd)
     375if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux netbsd openbsd)
    376376 TEMPLATE_BIN-THREADED_LIBS = pthread
    377377endif

  • trunk/kBuild/env.sh

    r2546 r3062  
    330330            KBUILD_HOST_ARCH='x86'
    331331            ;;
     332        alpha)
     333            KBUILD_HOST_ARCH='alpha'
     334            ;;
     335        aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*)
     336            KBUILD_HOST_ARCH='arm32'
     337            ;;
     338        aarch64*)
     339            KBUILD_HOST_ARCH='arm64'
     340            ;;
     341        hppa32|parisc32|parisc)
     342            KBUILD_HOST_ARCH='hppa32'
     343            ;;
     344        hppa64|parisc64)
     345            KBUILD_HOST_ARCH='hppa64'
     346            ;;
     347        ia64)
     348            KBUILD_HOST_ARCH='ia64'
     349            ;;
     350        ppc32|ppc|powerpc)
     351            KBUILD_HOST_ARCH='ppc32'
     352            ;;
     353        ppc64|ppc64le|powerpc64|powerpc64le)
     354            KBUILD_HOST_ARCH='ppc64'
     355            ;;
     356        mips32|mips)
     357            KBUILD_HOST_ARCH='mips32'
     358            ;;
     359        mips64)
     360            KBUILD_HOST_ARCH='mips64'
     361            ;;
     362        s390)
     363            KBUILD_HOST_ARCH='s390'
     364            ;;
     365        s390x)
     366            KBUILD_HOST_ARCH='s390x'
     367            ;;
     368        sh|sh2|sh2a|sh3|sh3|sh4|sh4a|sh4al|sh4al-dsp|shmedia)
     369            KBUILD_HOST_ARCH='sh32'
     370            ;;
     371        sh64)
     372            KBUILD_HOST_ARCH='sh64'
     373            ;;
    332374        sparc32|sparc|sparcv8|sparcv7|sparcv8e)
    333375            KBUILD_HOST_ARCH='sparc32'
    … …  
    335377        sparc64|sparcv9)
    336378            KBUILD_HOST_ARCH='sparc64'
    337             ;;
    338         s390)
    339             KBUILD_HOST_ARCH='s390'
    340             ;;
    341         s390x)
    342             KBUILD_HOST_ARCH='s390x'
    343             ;;
    344         ppc32|ppc|powerpc)
    345             KBUILD_HOST_ARCH='ppc32'
    346             ;;
    347         ppc64|powerpc64)
    348             KBUILD_HOST_ARCH='ppc64'
    349             ;;
    350         mips32|mips)
    351             KBUILD_HOST_ARCH='mips32'
    352             ;;
    353         mips64)
    354             KBUILD_HOST_ARCH='mips64'
    355             ;;
    356         ia64)
    357             KBUILD_HOST_ARCH='ia64'
    358             ;;
    359         hppa32|parisc32|parisc)
    360             KBUILD_HOST_ARCH='hppa32'
    361             ;;
    362         hppa64|parisc64)
    363             KBUILD_HOST_ARCH='hppa64'
    364             ;;
    365         arm|armv4l|armv5tel|armv5tejl)
    366             KBUILD_HOST_ARCH='arm'
    367             ;;
    368         alpha)
    369             KBUILD_HOST_ARCH='alpha'
    370379            ;;
    371380

  • trunk/kBuild/header.kmk

    r3061 r3062  
    197197# build types. (PORTME)
    198198#
    199 KBUILD_OSES      := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
    200 KBUILD_ARCHES    := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch
    201 KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
    202 KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
     199KBUILD_OSES      := darwin dos dragonfly freebsd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
     200KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
     201KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64
     202KBUILD_ARCHES_32 := x86 arm32 hppa32 mips32 ppc32 s390 sh32 sparc32
     203
    203204
    204205
    … …  
    602603HOST_PATH_SEP       := $(SEMICOLON)
    603604
    604 else if1of ($(KBUILD_HOST), freebsd dragonfly linux openbsd netbsd)
     605else if1of ($(KBUILD_HOST), dragonfly freebsd gnukfbsd gnuknbsd linux openbsd netbsd)
    605606# Unix (like) systems with wine.
    606607EXEC_X86_WIN32      := wine
    … …  
    648649SUFF_DLL    := .so
    649650SUFF_EXE    :=
    650  if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
     651 if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux netbsd openbsd) ## @todo check netbsd, gnuknbsd and openbsd.
    651652SUFF_SYS    := .ko
    652653 else
    … …  
    13821383 KBUILD_LIB_SEARCH_SUBS  := lib/
    13831384
    1384 else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd dragonfly)
     1385else if1of ($(KBUILD_TARGET), freebsd openbsd dragonfly)
    13851386 KBUILD_LIB_SEARCH_ROOTS := \
    13861387        / \
    … …  
    13891390 KBUILD_LIB_SEARCH_SUBS := lib/
    13901391
    1391 else ifeq ($(KBUILD_TARGET),linux)
     1392else ifeq ($(KBUILD_TARGET),netbsd)
     1393 KBUILD_LIB_SEARCH_ROOTS := \
     1394        / \
     1395        /usr/ \
     1396        /usr/pkg/ \
     1397        /usr/local/
     1398 KBUILD_LIB_SEARCH_SUBS := lib/
     1399
     1400else if1of ($(KBUILD_TARGET), gnukfbsd gnuknbsd linux)
    13921401 ifeq ($(realpath /bin),/usr/bin)
    13931402  KBUILD_LIB_SEARCH_ROOTS := \

  • trunk/kBuild/tools/GCC32.kmk

    r2775 r3062  
    4747TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET))
    4848endif
    49 TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
     49TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5050TOOL_GCC32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5151ifeq ($(KBUILD_TARGET),os2)

  • trunk/kBuild/tools/GCC64.kmk

    r2774 r3062  
    4747TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
    4848endif
    49 TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
     49TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5050TOOL_GCC64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5151ifeq ($(KBUILD_TARGET),os2)

  • trunk/kBuild/tools/GXX32.kmk

    r2775 r3062  
    4747TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET))
    4848endif
    49 TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
     49TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5050TOOL_GXX32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5151ifeq ($(KBUILD_TARGET),os2)

  • trunk/kBuild/tools/GXX64.kmk

    r2774 r3062  
    4747TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET))
    4848endif
    49 TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd",_fbsd,)
     49TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5050TOOL_GXX64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5151ifeq ($(KBUILD_TARGET),os2)

  • trunk/src/kash/Makefile.kmk

    r2652 r3062  
    5252        HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
    5353kash_DEFS.freebsd = \
     54        HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
     55kash_DEFS.gnukfbsd = HAVE_SYSCTL_H
     56kash_DEFS.netbsd = \
    5457        HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
    5558kash_DEFS.openbsd = \
    … …  
    100103        shthread.c \
    101104        shfile.c
     105kash_SOURCES.gnukfbsd = \
     106        sys_signame.c \
     107        strlcpy.c
     108kash_SOURCES.gnuknbsd = \
     109        sys_signame.c \
     110        strlcpy.c
    102111kash_SOURCES.haiku = \
    103112        sys_signame.c \
    … …  
    108117kash_SOURCES.solaris = \
    109118        sys_signame.c \
    110         strlcpy.c
     119        strlcpy.c
    111120kash_SOURCES.win = \
    112121        sys_signame.c \

  • trunk/src/kash/shell.h

    r1233 r3062  
    6262#endif
    6363
     64#if 0
    6465#ifndef DO_SHAREDVFORK
    6566# if __NetBSD_Version__ >= 104000000
    6667#  define DO_SHAREDVFORK
    6768# endif
     69#endif
    6870#endif
    6971

  • trunk/src/kmk/Makefile.kmk

    r3059 r3062  
    108108        glob/fnmatch.c
    109109
     110kmkmissing_SOURCES.gnukfbsd += \
     111        kmkbuiltin/strlcpy.c
     112
     113kmkmissing_SOURCES.gnuknbsd += \
     114        kmkbuiltin/strlcpy.c
     115
    110116kmkmissing_SOURCES.haiku = \
    111117        kmkbuiltin/haikufakes.c \
    … …  
    114120kmkmissing_SOURCES.linux += \
    115121        kmkbuiltin/strlcpy.c
     122
     123kmkmissing_SOURCES.netbsd = \
     124        glob/glob.c \
     125        glob/fnmatch.c
    116126
    117127kmkmissing_SOURCES.openbsd = \

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

    r2678 r3062  
    7373#ifndef __HAIKU__
    7474# include <sysexits.h>
     75#endif
     76#ifdef __NetBSD__
     77# include <util.h>
     78# define strtofflags(a, b, c)   string_to_flags(a, b, c)
    7579#endif
    7680#include <unistd.h>

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

    r2995 r3062  
    6666#ifdef __HAIKU__
    6767# include "haikufakes.h"
     68#endif
     69#ifdef __NetBSD__
     70# include <util.h>
     71# define fflagstostr(flags)     flags_to_string(flags, "")
    6872#endif
    6973#ifdef KBUILD_OS_WINDOWS

  • trunk/src/sed/Makefile.kmk

    r2909 r3062  
    7474        lib/strverscmp.c \
    7575        lib/obstack.c
     76kmk_sed_SOURCES.netbsd = \
     77        lib/strverscmp.c \
     78        lib/obstack.c \
     79        lib/getline.c
    7680kmk_sed_SOURCES.openbsd = \
    7781        lib/strverscmp.c \
Note: See TracChangeset for help on using the changeset viewer.