diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -47,19 +47,6 @@
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack', '-fstack-protector-all', '-Wl,-zrelro', '-Wl,-z,now', '-pie', '-fPIE']),
(0, ''))
- def test_32bit_PE(self):
- source = 'test1.c'
- executable = 'test1.exe'
- cc = 'i686-w64-mingw32-gcc'
- write_testcode(source)
-
- self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--no-nxcompat', '-Wl,--no-dynamicbase']),
- (1, executable + ': failed DYNAMIC_BASE NX'))
- self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat', '-Wl,--no-dynamicbase']),
- (1, executable + ': failed DYNAMIC_BASE'))
- self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat', '-Wl,--dynamicbase']),
- (0, ''))
-
def test_64bit_PE(self):
source = 'test1.c'
executable = 'test1.exe'
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py
--- a/contrib/gitian-build.py
+++ b/contrib/gitian-build.py
@@ -139,8 +139,6 @@
'--destination', '../gitian.sigs/', '../bitcoin-abc/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.check_call(
'mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/' + args.version, shell=True)
- subprocess.check_call(
- 'mv build/out/bitcoin-*win32-setup.exe ../bitcoin-binaries/' + args.version, shell=True)
if args.macos:
print('\nSigning ' + args.version + ' MacOS')
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -36,11 +36,10 @@
files: []
script: |
WRAP_DIR=$HOME/wrapped
- HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
+ HOSTS="x86_64-w64-mingw32"
# CMake toolchain file name differ from host name
declare -A CMAKE_TOOLCHAIN_FILE
- CMAKE_TOOLCHAIN_FILE[i686-w64-mingw32]=Win32.cmake
CMAKE_TOOLCHAIN_FILE[x86_64-w64-mingw32]=Win64.cmake
INSTALL_COMPONENTS="bitcoind bitcoin-qt"
@@ -164,7 +163,6 @@
# Allow extra cmake option to be specified for each host
declare -A CMAKE_EXTRA_OPTIONS
- CMAKE_EXTRA_OPTIONS[i686-w64-mingw32]="-DCPACK_PACKAGE_FILE_NAME=${DISTNAME}-win32-setup-unsigned"
CMAKE_EXTRA_OPTIONS[x86_64-w64-mingw32]="-DCPACK_PACKAGE_FILE_NAME=${DISTNAME}-win64-setup-unsigned"
ORIGPATH="$PATH"
@@ -212,6 +210,4 @@
cd $OUTDIR
find . -name "*-setup-unsigned.exe" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
- mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip
- mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip
diff --git a/depends/README.md b/depends/README.md
--- a/depends/README.md
+++ b/depends/README.md
@@ -14,7 +14,6 @@
- linux-arm
- linux-aarch64
- osx
- - win32
- win64
For example, building the dependencies for macOS:
diff --git a/doc/build-windows.md b/doc/build-windows.md
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -123,36 +123,6 @@
cmake -GNinja .. -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Win64.cmake -DBUILD_BITCOIN_SEEDER=OFF # seeder not supported in Windows yet
ninja
-## Building for 32-bit Windows
-
-To build executables for Windows 32-bit, install the following dependencies:
-
- sudo apt install g++-mingw-w64-i686 mingw-w64-i686-dev
-
-For Ubuntu Xenial 16.04 and later, including Ubuntu Bionic on the Windows Subsystem for Linux [2](#footnote2):
-
- sudo update-alternatives --config i686-w64-mingw32-g++ # Set the default mingw32 g++ compiler option to posix.
- sudo update-alternatives --config i686-w64-mingw32-gcc # Set the default mingw32 gcc compiler option to posix.
-
-Note that for WSL the Bitcoin ABC source path MUST be somewhere in the default mount file system, for
-example /usr/src/bitcoin-abc, AND not under /mnt/d/.
-This means you cannot use a directory that located directly on the host Windows file system to perform the build.
-
-Acquire the source in the usual way:
-
- git clone https://github.com/Bitcoin-ABC/bitcoin-abc.git
-
-Then build using:
-
- PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var
- cd depends
- make build-win32
- cd ..
- mkdir build
- cd build
- cmake -GNinja .. -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Win32.cmake -DBUILD_BITCOIN_SEEDER=OFF # seeder not supported in Windows yet
- ninja
-
## Depends system
For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
diff --git a/doc/release-notes.md b/doc/release-notes.md
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -3,3 +3,7 @@
This release includes the following features and fixes:
+ - The 32 bits Windows target is no longer supported. It will no longer be part
+ of the release shipment. Users that are willing to build for 32 bits Windows
+ should be aware that this will not be tested by the Bitcoin ABC team and be
+ prepared to face issues.