3 files changed, 135 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 9550c391a..3109e4fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,10 @@ SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
 
+# Colon is used as a separator in makefiles.  Strip any drive prefix
+# from the current directory to avoid confusion.
+CURDIR := $(lastword $(subst :, ,$(CURDIR)))
+
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README
@@ -192,6 +196,28 @@ ARCH ?= $(SUBARCH)
 # Architecture as present in compile.h
 UTS_MACHINE := $(ARCH)
 
+HOST_COMPILER ?=
+ifeq ($(HOST_COMPILER),)
+HOST_COMPILER := $(shell grep ^CONFIG_HOST_COMPILER= .config 2>/dev/null)
+HOST_COMPILER := $(subst CONFIG_HOST_COMPILER=,,$(HOST_COMPILER))
+HOST_COMPILER := $(subst ",,$(HOST_COMPILER))
+#")
+endif
+ifeq ($(HOST_COMPILER),)
+HOST_COMPILER := gcc
+endif
+
+CROSS_COMPILER ?=
+ifeq ($(CROSS_COMPILER),)
+CROSS_COMPILER := $(shell grep ^CONFIG_CROSS_COMPILER= .config 2>/dev/null)
+CROSS_COMPILER := $(subst CONFIG_CROSS_COMPILER=,,$(CROSS_COMPILER))
+CROSS_COMPILER := $(subst ",,$(CROSS_COMPILER))
+#")
+endif
+ifeq ($(CROSS_COMPILER),)
+CROSS_COMPILER := gcc
+endif
+
 # SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
           else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -260,8 +286,15 @@ endif
 
 # If the user is running make -s (silent mode), suppress echoing of
 # commands
+# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.
+
+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
+short-opts := $(firstword -$(MAKEFLAGS))
+else
+short-opts := $(filter-out --%,$(MAKEFLAGS))
+endif
 
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(findstring s,$(short-opts)),)
   quiet=silent_
 endif
 
@@ -271,7 +304,7 @@ export quiet Q KBUILD_VERBOSE
 # Look for make include files relative to root of kernel src
 MAKEFLAGS += --include-dir=$(srctree)
 
-HOSTCC          = gcc
+HOSTCC          = $(HOST_COMPILER)
 HOSTCXX         = g++
 HOSTCFLAGS      :=
 HOSTCXXFLAGS    :=
@@ -289,7 +322,7 @@ MAKEFLAGS += -rR
 # Make variables (CC, etc...)
 
 AS              = $(CROSS_COMPILE)as
-CC              = $(CROSS_COMPILE)gcc
+CC              = $(CROSS_COMPILE)$(CROSS_COMPILER)
 LD              = $(CC) -nostdlib
 CPP             = $(CC) -E
 AR              = $(CROSS_COMPILE)ar
@@ -297,6 +330,7 @@ NM		= $(CROSS_COMPILE)nm
 STRIP           = $(CROSS_COMPILE)strip
 OBJCOPY         = $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump
+WINDRES         = $(CROSS_COMPILE)windres
 PKG_CONFIG      ?= $(CROSS_COMPILE)pkg-config
 AWK             = awk
 GENKSYMS        = scripts/genksyms/genksyms
@@ -305,6 +339,15 @@ KALLSYMS	= scripts/kallsyms
 PERL            = perl
 CHECK           = sparse
 
+# Handle MSYS2 weirdness
+ifneq ($(CROSS_COMPILE),)
+ifeq ($(shell _= command -v $(AR)),)
+AR := $(CROSS_COMPILE)gcc-ar
+STRIP := strip
+WINDRES := windres
+endif
+endif
+
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
 MODFLAGS        = -DMODULE
 CFLAGS_MODULE   = $(MODFLAGS)
@@ -312,6 +355,7 @@ AFLAGS_MODULE   = $(MODFLAGS)
 LDFLAGS_MODULE  = -r
 CFLAGS_KERNEL   =
 AFLAGS_KERNEL   =
+EXEEXT          =
 
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
@@ -324,13 +368,43 @@ AFLAGS		:= $(AFLAGS)
 LDFLAGS         := $(LDFLAGS)
 LDLIBS          :=
 
+CONFIG_PLATFORM_MINGW32 ?=
+ifeq ($(CONFIG_PLATFORM_MINGW32),)
+CONFIG_PLATFORM_MINGW32 := $(shell grep ^CONFIG_PLATFORM_MINGW32= .config 2>/dev/null)
+CONFIG_PLATFORM_MINGW32 := $(subst CONFIG_PLATFORM_MINGW32=,,$(CONFIG_PLATFORM_MINGW32))
+CONFIG_PLATFORM_MINGW32 := $(subst ",,$(CONFIG_PLATFORM_MINGW32))
+#")
+endif
+
+# Try various methods to get a more specific EXTRAVERSION, but only
+# for MINGW32 platform and if EXTRAVERSION is default '.git'
+ifeq ($(CONFIG_PLATFORM_MINGW32)$(EXTRAVERSION),y.git)
+# Ask git
+extraversion := $(shell cd $(srctree) && git describe --match FRP 2>/dev/null)
+ifeq ($(strip $(extraversion)),)
+# That didn't work, look for a .frp_describe file
+extraversion := $(shell grep '^FRP-' $(srctree)/.frp_describe 2>/dev/null)
+ifeq ($(strip $(extraversion)),)
+# That didn't work either, look at name of source directory
+e1 := $(shell basename $(srctree) | grep '^busybox-w32-FRP-')
+ifneq ($(strip $(e1)),)
+extraversion := $(subst busybox-w32-,,$(e1))
+endif
+endif
+endif
+
+ifneq ($(strip $(extraversion)),)
+EXTRAVERSION := .$(subst FRP,git,$(extraversion))
+endif
+endif
+
 # Read KERNELRELEASE from .kernelrelease (if it exists)
 KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 export  VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
         ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
-        CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
+        CPP AR NM STRIP OBJCOPY OBJDUMP WINDRES MAKE AWK GENKSYMS PERL UTS_MACHINE \
         HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
 
 export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
@@ -462,6 +536,7 @@ scripts_basic: include/autoconf.h
 # Objects we will link into busybox / subdirs we need to visit
 core-y          := \
                 applets/ \
+                win32/resources/ \
 
 libs-y          := \
                 archival/ \
@@ -492,6 +567,7 @@ libs-y		:= \
                 sysklogd/ \
                 util-linux/ \
                 util-linux/volume_id/ \
+                win32/ \
 
 endif # KBUILD_EXTMOD
 
@@ -532,7 +608,7 @@ endif
 # command line.
 # This allow a user to issue only 'make' to build a kernel including modules
 # Defaults busybox but it is usually overridden in the arch makefile
-all: busybox doc
+all: busybox$(EXEEXT) doc
 
 # arch Makefile may override CC so keep this after arch Makefile is included
 #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
@@ -612,8 +688,12 @@ quiet_cmd_busybox__ ?= LINK    $@
       "$(core-y)" \
       "$(libs-y)" \
       "$(LDLIBS)" \
-      "$(CONFIG_EXTRA_LDLIBS)" \
+      $(CONFIG_EXTRA_LDLIBS) \
       && $(srctree)/scripts/generate_BUFSIZ.sh --post include/common_bufsiz.h
+# ^^^ note: CONFIG_xyz strings already have double quotes: their value
+# is '"LIB LIB2"', therefore $(CONFIG_EXTRA_LDLIBS) above must NOT be written
+# as "$(CONFIG_EXTRA_LDLIBS)", it would be passed as ""LIB LIB2"",
+# and LIB2 would end up in $9, not $8 (and lost or misinterpreted).
 
 # Generate System.map
 quiet_cmd_sysmap = SYSMAP
@@ -715,16 +795,16 @@ debug_kallsyms: .tmp_map$(last_kallsyms)
 endif # ifdef CONFIG_KALLSYMS
 
 # busybox image - including updated kernel symbols
-busybox_unstripped: $(busybox-all) FORCE
+busybox_unstripped$(EXEEXT): $(busybox-all) FORCE
         $(call if_changed_rule,busybox__)
         $(Q)rm -f .old_version
 
-busybox: busybox_unstripped
+busybox$(EXEEXT): busybox_unstripped$(EXEEXT)
 ifeq ($(SKIP_STRIP),y)
         $(Q)cp $< $@
 else
         $(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
-                busybox_unstripped -o $@
+                busybox_unstripped$(EXEEXT) -o $@
 # strip is confused by PIE executable and does not set exec bits
         $(Q)chmod a+x $@
 endif
@@ -816,7 +896,7 @@ endif
 # prepare2 creates a makefile if using a separate output directory
 prepare2: prepare3 outputmakefile
 
-prepare1: prepare2 include/config/MARKER
+prepare1: prepare2 include/config/MARKER include/BB_VER.h
 ifneq ($(KBUILD_MODULES),)
         $(Q)mkdir -p $(MODVERDIR)
         $(Q)rm -f $(MODVERDIR)/*
@@ -880,6 +960,13 @@ define filechk_version.h
         )
 endef
 
+define filechk_BB_VER.h
+        (echo \#define BB_VER \"$(KERNELRELEASE)\";)
+endef
+
+include/BB_VER.h: $(srctree)/Makefile .config .kernelrelease FORCE
+        $(call filechk,BB_VER.h)
+
 # ---------------------------------------------------------------------------
 
 PHONY += depend dep
@@ -966,7 +1053,7 @@ endif # CONFIG_MODULES
 
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR) _install 0_lib
-CLEAN_FILES +=  busybox busybox_unstripped* busybox.links \
+CLEAN_FILES +=  busybox$(EXEEXT) busybox_unstripped* busybox.links \
                 busybox*.suid busybox*.nosuid \
                 System.map .kernelrelease \
                 .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
@@ -975,6 +1062,7 @@ CLEAN_FILES +=	busybox busybox_unstripped* busybox.links \
 MRPROPER_DIRS  += include/config include2
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/NUM_APPLETS.h \
+                  include/BB_VER.h \
                   include/common_bufsiz.h \
                   include/autoconf.h \
                   include/bbconfigopts.h \
@@ -985,6 +1073,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/applets.h \
                   include/usage.h \
                   applets/usage \
+                  win32/resources/busybox-w32.manifest \
                   .kernelrelease Module.symvers tags TAGS cscope* \
                   busybox_old
 
diff --git a/Makefile.custom b/Makefile.custom
index 6f679c4e1..e2f6d1c2f 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -104,29 +104,29 @@ checkhelp:
                 $(patsubst %,$(srctree)/%,$(wildcard $(patsubst %,%/Config.in,$(busybox-dirs) ./)))
 
 .PHONY: sizes
-sizes: busybox_unstripped
+sizes: busybox_unstripped$(EXEEXT)
         $(NM) --size-sort $(<)
 
 .PHONY: bloatcheck
-bloatcheck: busybox_old busybox_unstripped
-        @$(srctree)/scripts/bloat-o-meter busybox_old busybox_unstripped
-        @$(CROSS_COMPILE)size busybox_old busybox_unstripped
+bloatcheck: busybox_old$(EXEEXT) busybox_unstripped$(EXEEXT)
+        @$(srctree)/scripts/bloat-o-meter busybox_old$(EXEEXT) busybox_unstripped$(EXEEXT)
+        @$(CROSS_COMPILE)size busybox_old$(EXEEXT) busybox_unstripped$(EXEEXT)
 
 .PHONY: baseline
-baseline: busybox_unstripped
-        @mv busybox_unstripped busybox_old
+baseline: busybox_unstripped$(EXEEXT)
+        @mv busybox_unstripped$(EXEEXT) busybox_old$(EXEEXT)
 
 .PHONY: objsizes
-objsizes: busybox_unstripped
+objsizes: busybox_unstripped$(EXEEXT)
         $(srctree)/scripts/objsizes
 
 .PHONY: stksizes
-stksizes: busybox_unstripped
-        $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
+stksizes: busybox_unstripped$(EXEEXT)
+        $(CROSS_COMPILE)objdump -d busybox_unstripped$(EXEEXT) | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
 
 .PHONY: bigdata
-bigdata: busybox_unstripped
-        $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [trw] '
+bigdata: busybox_unstripped$(EXEEXT)
+        $(CROSS_COMPILE)nm --size-sort busybox_unstripped$(EXEEXT) | grep -vi ' [trw] '
 
 # Documentation Targets
 .PHONY: doc
diff --git a/Makefile.flags b/Makefile.flags
index 97cb4dca2..bf094ec5e 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -16,7 +16,8 @@ CPPFLAGS += \
         -D_GNU_SOURCE -DNDEBUG \
         $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
         $(if $(CONFIG_TIME64),-D_TIME_BITS=64) \
-        -DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote)
+        -DMINGW_VER=$(squote)$(quote)$(MINGW_VER)$(quote)$(squote) \
+        $(if $(CONFIG_PLATFORM_MINGW32),,-DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote))
 
 CFLAGS += $(call cc-option,-Wall,)
 CFLAGS += $(call cc-option,-Wshadow,)
@@ -72,8 +73,13 @@ CFLAGS += $(call cc-option,-falign-jumps=1 -falign-labels=1 -falign-loops=1,)
 endif
 
 # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary):
+ifneq ($(CONFIG_UNWIND_TABLES),y)
 CFLAGS += $(call cc-option,-fno-unwind-tables,)
 CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,)
+else
+CFLAGS += $(call cc-option,-funwind-tables,)
+CFLAGS += $(call cc-option,-fasynchronous-unwind-tables,)
+endif
 # No automatic printf->puts,putchar conversions
 # (try disabling this and comparing assembly, it's instructive)
 CFLAGS += $(call cc-option,-fno-builtin-printf,)
@@ -146,6 +152,22 @@ CFLAGS += --sysroot=$(CONFIG_SYSROOT)
 export SYSROOT=$(CONFIG_SYSROOT)
 endif
 
+ifeq ($(CONFIG_PLATFORM_MINGW32),y)
+CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy -fno-builtin-stpncpy -fno-ident -fno-builtin-strndup
+# this seems to be necessary for setjmp/longjmp to work with clang
+ifeq ($(lastword $(subst -, ,$(CC))),clang)
+ifeq ($(CONFIG_UNWIND_TABLES),y)
+CFLAGS += $(call cc-option,-fexceptions,)
+else
+CFLAGS += $(call cc-option,-fsjlj-exceptions,)
+endif
+endif
+
+EXEEXT = .exe
+LDLIBS += ws2_32
+endif
+
+ifneq ($(CONFIG_PLATFORM_MINGW32),y)
 # libm may be needed for dc, awk, ntpd
 LDLIBS += m
 # Android has no separate crypt library
@@ -161,6 +183,7 @@ endif
 ifeq ($(RT_AVAILABLE),y)
 LDLIBS += rt
 endif
+endif
 
 # libpam may use libpthread, libdl and/or libaudit.
 # On some platforms that requires an explicit -lpthread, -ldl, -laudit.