[llvm-branch-commits] [libunwind] 757752f - Bump version to 12.0.1

2021-04-22 Thread Tom Stellard via llvm-branch-commits

Author: Tom Stellard
Date: 2021-04-22T15:03:36-07:00
New Revision: 757752f568db698e3c0c35065c008489f2319a7b

URL: 
https://github.com/llvm/llvm-project/commit/757752f568db698e3c0c35065c008489f2319a7b
DIFF: 
https://github.com/llvm/llvm-project/commit/757752f568db698e3c0c35065c008489f2319a7b.diff

LOG: Bump version to 12.0.1

Added: 


Modified: 
libcxx/CMakeLists.txt
libcxxabi/CMakeLists.txt
libunwind/CMakeLists.txt
llvm/CMakeLists.txt
llvm/utils/gn/secondary/llvm/version.gni
llvm/utils/lit/lit/__init__.py
llvm/utils/release/build_llvm_package.bat

Removed: 




diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 9bf1a02f0908a..cdd5495e36ab0 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -29,7 +29,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR 
LIBCXX_STANDALONE_BUIL
   project(libcxx CXX C)
 
   set(PACKAGE_NAME libcxx)
-  set(PACKAGE_VERSION 12.0.0)
+  set(PACKAGE_VERSION 12.0.1)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "llvm-b...@lists.llvm.org")
 

diff  --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
index 426c855288fcf..6de2b5a2ed103 100644
--- a/libcxxabi/CMakeLists.txt
+++ b/libcxxabi/CMakeLists.txt
@@ -28,7 +28,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR 
LIBCXXABI_STANDALONE_B
   project(libcxxabi CXX C)
 
   set(PACKAGE_NAME libcxxabi)
-  set(PACKAGE_VERSION 11.0.0)
+  set(PACKAGE_VERSION 12.0.1)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "llvm-b...@lists.llvm.org")
 

diff  --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index 48cb8e004e08c..570b8db906532 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -24,7 +24,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR 
LIBUNWIND_STANDALONE_B
   project(libunwind LANGUAGES C CXX ASM)
 
   set(PACKAGE_NAME libunwind)
-  set(PACKAGE_VERSION 12.0.0)
+  set(PACKAGE_VERSION 12.0.1)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "llvm-b...@lists.llvm.org")
 

diff  --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 277d0fe54d7b5..28ccef34d8fc7 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -11,7 +11,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
-  set(LLVM_VERSION_PATCH 0)
+  set(LLVM_VERSION_PATCH 1)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
   set(LLVM_VERSION_SUFFIX "")

diff  --git a/llvm/utils/gn/secondary/llvm/version.gni 
b/llvm/utils/gn/secondary/llvm/version.gni
index a66a92550a00e..942974f7cf911 100644
--- a/llvm/utils/gn/secondary/llvm/version.gni
+++ b/llvm/utils/gn/secondary/llvm/version.gni
@@ -1,4 +1,4 @@
 llvm_version_major = 12
 llvm_version_minor = 0
-llvm_version_patch = 0
+llvm_version_patch = 1
 llvm_version = "$llvm_version_major.$llvm_version_minor.$llvm_version_patch"

diff  --git a/llvm/utils/lit/lit/__init__.py b/llvm/utils/lit/lit/__init__.py
index 9c2aa512e179a..c281391466b8b 100644
--- a/llvm/utils/lit/lit/__init__.py
+++ b/llvm/utils/lit/lit/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = 'Daniel Dunbar'
 __email__ = 'dan...@minormatter.com'
-__versioninfo__ = (12, 0, 0)
+__versioninfo__ = (12, 0, 1)
 __version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev'
 
 __all__ = []

diff  --git a/llvm/utils/release/build_llvm_package.bat 
b/llvm/utils/release/build_llvm_package.bat
index 35dcd9f613c42..4747c70ca3927 100755
--- a/llvm/utils/release/build_llvm_package.bat
+++ b/llvm/utils/release/build_llvm_package.bat
@@ -27,8 +27,8 @@ set 
python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36
 for /f "usebackq" %%i in (`PowerShell ^(Get-Date^).ToString^('MMdd'^)`) do 
set datestamp=%%i
 
 set revision=%1
-set package_version=12.0.0-%revision:~0,8%
-set clang_format_vs_version=12.0.0.%datestamp%
+set package_version=12.0.1-%revision:~0,8%
+set clang_format_vs_version=12.0.1.%datestamp%
 set build_dir=llvm_package_%revision:~0,8%
 
 echo Revision: %revision%



___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits


[llvm-branch-commits] [llvm] eae7f3e - [lit] Pass the USERPROFILE variable through on Windows

2021-04-22 Thread Martin Storsjö via llvm-branch-commits

Author: Martin Storsjö
Date: 2021-04-23T09:23:17+03:00
New Revision: eae7f3e3d45077a509a37bb2f2ff36b8196a855e

URL: 
https://github.com/llvm/llvm-project/commit/eae7f3e3d45077a509a37bb2f2ff36b8196a855e
DIFF: 
https://github.com/llvm/llvm-project/commit/eae7f3e3d45077a509a37bb2f2ff36b8196a855e.diff

LOG: [lit] Pass the USERPROFILE variable through on Windows

When running in a Windows Container, the Git for Windows Unix tools
(C:\Program Files\Git\usr\bin) just hang if this variable isn't
passed through.

Currently, running the LLVM/clang tests in a Windows Container fails
if that directory is added to the path, but succeeds after this change.
(After this change, the previously used GnuWin tools can be left out
entirely, too, as lit automatically picks up the Git for Windows tools
if necessary.)

Differential Revision: https://reviews.llvm.org/D98858

(cherry picked from commit 9de63b2e051cb3e79645cc20b83b4d33d132cba0)

Added: 


Modified: 
llvm/utils/lit/lit/TestingConfig.py

Removed: 




diff  --git a/llvm/utils/lit/lit/TestingConfig.py 
b/llvm/utils/lit/lit/TestingConfig.py
index 38d05066a2b0..e6c1b937c27a 100644
--- a/llvm/utils/lit/lit/TestingConfig.py
+++ b/llvm/utils/lit/lit/TestingConfig.py
@@ -33,6 +33,7 @@ def fromdefaults(litConfig):
 pass_vars.append('INCLUDE')
 pass_vars.append('LIB')
 pass_vars.append('PATHEXT')
+pass_vars.append('USERPROFILE')
 environment['PYTHONBUFFERED'] = '1'
 
 for var in pass_vars:



___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits


[llvm-branch-commits] [lld] 072c90a - [LLD] Fix probing a MSYS based 'tar' in a Windows Container

2021-04-22 Thread Martin Storsjö via llvm-branch-commits

Author: Martin Storsjö
Date: 2021-04-23T09:23:17+03:00
New Revision: 072c90a863aac1334a4950b3da262a025516dea0

URL: 
https://github.com/llvm/llvm-project/commit/072c90a863aac1334a4950b3da262a025516dea0
DIFF: 
https://github.com/llvm/llvm-project/commit/072c90a863aac1334a4950b3da262a025516dea0.diff

LOG: [LLD] Fix probing a MSYS based 'tar' in a Windows Container

Don't run the 'tar' tool in a cleared environment with only the
LANG variable set, just set LANG on top of the existing environment.

If the 'tar' tool is an MSYS based tool, running it in a Windows
Container hangs if all environment variables are cleared - in
particular, the USERPROFILE variable needs to be kept intact.

This is the same issue fixed as was fixed in other places in
9de63b2e051cb3e79645cc20b83b4d33d132cba0, but contrary to running
the actual tests, running with an as-cleared-as-possible environment
here is less important.

Differential Revision: https://reviews.llvm.org/D99304

(cherry picked from commit a88556733a4dced22416bd3f45255128b9eb4f49)

Added: 


Modified: 
lld/test/lit.cfg.py

Removed: 




diff  --git a/lld/test/lit.cfg.py b/lld/test/lit.cfg.py
index 8e31fd3977f9a..670f41f0b6313 100644
--- a/lld/test/lit.cfg.py
+++ b/lld/test/lit.cfg.py
@@ -101,11 +101,13 @@
 
 tar_executable = lit.util.which('tar', config.environment['PATH'])
 if tar_executable:
+env = os.environ
+env['LANG'] = 'C'
 tar_version = subprocess.Popen(
 [tar_executable, '--version'],
 stdout=subprocess.PIPE,
 stderr=subprocess.PIPE,
-env={'LANG': 'C'})
+env=env)
 sout, _ = tar_version.communicate()
 if 'GNU tar' in sout.decode():
 config.available_features.add('gnutar')



___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits