Merge branch 'master' into openbsd-minimal

Author: semarie

CMakeLists.txt

@@ -55,10 +55,7 @@ message("Configuring zig version ${ZIG_VERSION}")
 set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")
 set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")
 set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")
-set(ZIG_WORKAROUND_4799 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/4799")
-set(ZIG_WORKAROUND_POLLY_SO off CACHE STRING "workaround for https://github.com/ziglang/zig/issues/4799")
 set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")
-set(ZIG_WORKAROUND_6087 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/6087")
 
 if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)
     SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
@@ -88,18 +85,12 @@ find_package(lld)
 
 if(APPLE AND ZIG_STATIC)
     list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
-    find_library(ZLIB NAMES z zlib libz)
+    find_library(ZLIB NAMES libz.a z zlib libz)
     list(APPEND LLVM_LIBRARIES "${ZLIB}")
-endif()
-
-if(APPLE AND ZIG_WORKAROUND_6087)
-    list(REMOVE_ITEM LLVM_LIBRARIES "-llibxml2.tbd")
-    list(APPEND LLVM_LIBRARIES "-lxml2")
-endif()
 
-if(APPLE AND ZIG_WORKAROUND_4799)
-  # eg: ${CMAKE_PREFIX_PATH} could be /usr/local/opt/llvm/
-  list(APPEND LLVM_LIBRARIES "-Wl,${CMAKE_PREFIX_PATH}/lib/libPolly.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyPPCG.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyISL.a")
+    list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
+    find_library(CURSES NAMES libcurses.a curses libcurses libncurses.a ncurses libncurses)
+    list(APPEND LLVM_LIBRARIES "${CURSES}")
 endif()
 
 set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zigcpp")
@@ -363,7 +354,7 @@ endif()
 if(MSVC)
     set(EXE_CFLAGS "${EXE_CFLAGS}")
 else()
-    set(EXE_CFLAGS "${EXE_CFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=type-limits -Wno-missing-braces")
+    set(EXE_CFLAGS "${EXE_CFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=type-limits -Wno-missing-braces -Wno-comment")
     if(MINGW)
         set(EXE_CFLAGS "${EXE_CFLAGS} -Wno-format")
     endif()
@@ -415,9 +406,6 @@ target_link_libraries(zigcpp LINK_PUBLIC
     ${LLVM_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-if(ZIG_WORKAROUND_POLLY_SO)
-  target_link_libraries(zigcpp LINK_PUBLIC "-Wl,${ZIG_WORKAROUND_POLLY_SO}")
-endif()
 
 add_library(opt_c_util STATIC ${OPTIMIZED_C_SOURCES})
 set_target_properties(opt_c_util PROPERTIES

README.md

@@ -32,7 +32,7 @@ This step must be repeated when you make changes to any of the C++ source code.
 
  * cmake >= 2.8.5
  * gcc >= 5.0.0 or clang >= 3.6.0
- * LLVM, Clang, LLD development libraries == 10.x, compiled with the same gcc or clang version above
+ * LLVM, Clang, LLD development libraries == 11.x, compiled with the same gcc or clang version above
    - Use the system package manager, or [build from source](https://github.com/ziglang/zig/wiki/How-to-build-LLVM,-libclang,-and-liblld-from-source#posix).
 
 ##### Windows
@@ -41,7 +41,7 @@ This step must be repeated when you make changes to any of the C++ source code.
  * Microsoft Visual Studio. Supported versions:
    - 2017 (version 15.8)
    - 2019 (version 16)
- * LLVM, Clang, LLD development libraries == 10.x
+ * LLVM, Clang, LLD development libraries == 11.x
    - Use the [pre-built binaries](https://github.com/ziglang/zig/wiki/Building-Zig-on-Windows) or [build from source](https://github.com/ziglang/zig/wiki/How-to-build-LLVM,-libclang,-and-liblld-from-source#windows).
 
 #### Instructions
@@ -68,19 +68,6 @@ cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)
 make install
 ```
 
-You will now run into this issue:
-[homebrew and llvm 10 packages in apt.llvm.org are broken with undefined reference to getPollyPluginInfo](https://github.com/ziglang/zig/issues/4799)
-or
-[error: unable to create target: 'Unable to find target for this triple (no targets are registered)'](https://github.com/ziglang/zig/issues/5055),
-in which case try `-DZIG_WORKAROUND_4799=ON`
-
-This has been fixed upstream with LLVM 10.0.1.
-
-Building with LLVM 10.0.1 you might run into this problem:
-`ld: library not found for -llibxml2.tbd`
-[Building with LLVM 10.0.1 installed via Homebrew fails](https://github.com/ziglang/zig/issues/6087),
-in which case you can try `-DZIG_WORKAROUND_6087=ON`.
-
 ##### Windows
 
 See https://github.com/ziglang/zig/wiki/Building-Zig-on-Windows

ci/azure/linux_script

@@ -5,14 +5,14 @@ set -e
 
 BUILDDIR="$(pwd)"
 
-sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" >> /etc/apt/sources.list'
+sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" >> /etc/apt/sources.list'
 wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt-get update -q
 
 sudo apt-get remove -y llvm-*
 sudo rm -rf /usr/local/*
-sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
+sudo apt-get install -y libxml2-dev libclang-11-dev llvm-11 llvm-11-dev liblld-11-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
 
 QEMUBASE="qemu-linux-x86_64-5.1.0"
 wget https://ziglang.org/deps/$QEMUBASE.tar.xz
@@ -44,7 +44,7 @@ VERSION="$(./zig version)"
 if [ "${BUILD_REASON}" != "PullRequest" ]; then
   ARTIFACTSDIR="$BUILDDIR/artifacts"
   mkdir "$ARTIFACTSDIR"
-  docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64-1 -j2 $BUILD_SOURCEVERSION
+  docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm11-x86_64-1 -j2 $BUILD_SOURCEVERSION
   TARBALL="$(ls $ARTIFACTSDIR)"
   mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
   s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/

ci/azure/macos_script

@@ -3,28 +3,26 @@
 set -x
 set -e
 
-system_profiler SPHardwareDataType
-
-brew install s3cmd gcc@9
+brew install s3cmd
 
 ZIGDIR="$(pwd)"
-LLVMVER="10.0.1"
 ARCH="x86_64"
-CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc9-release"
+CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-macos-gnu-0.6.0+1c9ef63a"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j2"
 
-# I tried using the system default compiler (clang), but it couldn't statically link libc++.
-# So we use gcc-9 from homebrew.
-export CC=gcc-9
-export CXX=g++-9
-
 rm -rf $PREFIX
-
 cd $HOME
-wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
+wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
 tar xf "$CACHE_BASENAME.tar.xz"
 
+ZIG="$PREFIX/bin/zig"
+NATIVE_LIBC_TXT="$HOME/native_libc.txt"
+$ZIG libc > "$NATIVE_LIBC_TXT"
+export ZIG_LIBC="$NATIVE_LIBC_TXT"
+export CC="$ZIG cc"
+export CXX="$ZIG c++"
+
 cd $ZIGDIR
 
 # Make the `zig version` number consistent.
@@ -33,7 +31,21 @@ git config core.abbrev 9
 
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$(pwd)/release -DZIG_STATIC=ON
+cmake .. \
+  -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \
+  -DCMAKE_PREFIX_PATH="$PREFIX" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \
+  -DZIG_TARGET_MCPU="baseline" \
+  -DZIG_EXECUTABLE="$ZIG" \
+  -DZIG_STATIC=ON
+
+# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
+# so that installation and testing do not get affected by them.
+unset CC
+unset CXX
+unset ZIG_LIBC
+
 make $JOBS install
 release/bin/zig build test
 

ci/azure/pipelines.yml

@@ -1,7 +1,7 @@
 jobs:
 - job: BuildMacOS
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
 
   timeoutInMinutes: 360
 

ci/azure/windows_msvc_install

@@ -7,5 +7,5 @@ pacman -Su --needed --noconfirm
 pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
 
 pip install s3cmd
-wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
-tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
+wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz"
+tar xf llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz

ci/azure/windows_msvc_script.bat

@@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%"
 
 SET "ZIGBUILDDIR=%SRCROOT%\build"
 SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
-SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt"
+SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt"
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
 

ci/drone/drone.yml

@@ -7,7 +7,7 @@ platform:
 
 steps:
 - name: build-and-test
-  image: ziglang/static-base:llvm10-aarch64-1
+  image: ziglang/static-base:llvm11-aarch64-1
   environment:
     SRHT_OAUTH_TOKEN:
       from_secret: SRHT_OAUTH_TOKEN

ci/srht/freebsd_script

@@ -7,7 +7,7 @@ sudo pkg update -fq
 sudo pkg install -y cmake py27-s3cmd wget curl jq
 
 ZIGDIR="$(pwd)"
-CACHE_BASENAME="llvm+clang+lld-10.0.0-x86_64-freebsd-release"
+CACHE_BASENAME="llvm+clang+lld-11.0.0-x86_64-freebsd-release"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j$(sysctl -n hw.ncpu)"
 
@@ -31,24 +31,7 @@ cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" -DZIG_STATIC=ON
 make $JOBS install
 
-release/bin/zig build test-fmt
-release/bin/zig build test-behavior
-# TODO get these tests passing on freebsd and re-enable
-#release/bin/zig build test-std
-release/bin/zig build test-compiler-rt
-release/bin/zig build test-compare-output
-release/bin/zig build test-standalone
-release/bin/zig build test-stack-traces
-release/bin/zig build test-cli
-release/bin/zig build test-asm-link
-release/bin/zig build test-runtime-safety
-release/bin/zig build test-translate-c
-release/bin/zig build test-run-translated-c
-# TODO disabled until we are shipping self-hosted
-#release/bin/zig build test-gen-h
-# TODO disabled to save time and hit that 45 minute limit
-#release/bin/zig build test-compile-errors
-release/bin/zig build docs
+release/bin/zig build test
 
 if [ -f ~/.s3cfg ]; then
   mv ../LICENSE release/

cmake/Findclang.cmake

@@ -9,27 +9,27 @@
 
 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
   PATHS
-    /usr/lib/llvm/10/include
-    /usr/lib/llvm-10/include
-    /usr/lib/llvm-10.0/include
-    /usr/local/llvm100/include
-    /usr/local/llvm10/include
+    /usr/lib/llvm/11/include
+    /usr/lib/llvm-11/include
+    /usr/lib/llvm-11.0/include
+    /usr/local/llvm110/include
+    /usr/local/llvm11/include
     /mingw64/include
 )
 
 if(ZIG_PREFER_CLANG_CPP_DYLIB)
   find_library(CLANG_LIBRARIES
     NAMES
-      clang-cpp-10.0
-      clang-cpp100
+      clang-cpp-11.0
+      clang-cpp110
       clang-cpp
     PATHS
       ${CLANG_LIBDIRS}
-      /usr/lib/llvm/10/lib
-      /usr/lib/llvm/10/lib64
-      /usr/lib/llvm-10/lib
-      /usr/local/llvm100/lib
-      /usr/local/llvm10/lib
+      /usr/lib/llvm/11/lib
+      /usr/lib/llvm/11/lib64
+      /usr/lib/llvm-11/lib
+      /usr/local/llvm110/lib
+      /usr/local/llvm11/lib
   )
 endif()
 
@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)
     find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
       PATHS
         ${CLANG_LIBDIRS}
-        /usr/lib/llvm/10/lib
-        /usr/lib/llvm-10/lib
-        /usr/lib/llvm-10.0/lib
-        /usr/local/llvm100/lib
-        /usr/local/llvm10/lib
+        /usr/lib/llvm/11/lib
+        /usr/lib/llvm-11/lib
+        /usr/lib/llvm-11.0/lib
+        /usr/local/llvm110/lib
+        /usr/local/llvm11/lib
         /mingw64/lib
         /c/msys64/mingw64/lib
         c:\\msys64\\mingw64\\lib
@@ -75,6 +75,7 @@ if(NOT CLANG_LIBRARIES)
   FIND_AND_ADD_CLANG_LIB(clangRewrite)
   FIND_AND_ADD_CLANG_LIB(clangCrossTU)
   FIND_AND_ADD_CLANG_LIB(clangIndex)
+  FIND_AND_ADD_CLANG_LIB(clangToolingCore)
 endif()
 
 include(FindPackageHandleStandardArgs)

cmake/Findlld.cmake

@@ -8,16 +8,16 @@
 
 find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
     PATHS
-        /usr/lib/llvm-10/include
-        /usr/local/llvm100/include
-        /usr/local/llvm10/include
+        /usr/lib/llvm-11/include
+        /usr/local/llvm110/include
+        /usr/local/llvm11/include
         /mingw64/include)
 
-find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld
+find_library(LLD_LIBRARY NAMES lld-11.0 lld110 lld
     PATHS
-        /usr/lib/llvm-10/lib
-        /usr/local/llvm100/lib
-        /usr/local/llvm10/lib
+        /usr/lib/llvm-11/lib
+        /usr/local/llvm110/lib
+        /usr/local/llvm11/lib
 )
 if(EXISTS ${LLD_LIBRARY})
     set(LLD_LIBRARIES ${LLD_LIBRARY})
@@ -27,9 +27,9 @@ else()
         find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
             PATHS
                 ${LLD_LIBDIRS}
-                /usr/lib/llvm-10/lib
-                /usr/local/llvm100/lib
-                /usr/local/llvm10/lib
+                /usr/lib/llvm-11/lib
+                /usr/local/llvm110/lib
+                /usr/local/llvm11/lib
                 /mingw64/lib
                 /c/msys64/mingw64/lib
                 c:/msys64/mingw64/lib)