diff --git a/clang-tools-extra/docs/clang-doc.rst b/clang-tools-extra/docs/clang-doc.rst
index 9be8a8dc31d4..2db3e914ac8a 100644
--- a/clang-tools-extra/docs/clang-doc.rst
+++ b/clang-tools-extra/docs/clang-doc.rst
@@ -12,7 +12,7 @@ source code and comments.
The tool is in a very early development stage, so you might encounter bugs and
crashes. Submitting reports with information about how to reproduce the issue
-to `the LLVM bugtracker `_ will definitely help the
+to `the LLVM bug tracker `_ will definitely help the
project. If you have any ideas or suggestions, please to put a feature request
there.
diff --git a/clang/docs/CommandGuide/clang.rst b/clang/docs/CommandGuide/clang.rst
index a24e138e86a7..6797020d1b68 100644
--- a/clang/docs/CommandGuide/clang.rst
+++ b/clang/docs/CommandGuide/clang.rst
@@ -662,7 +662,7 @@ ENVIRONMENT
BUGS
----
-To report bugs, please visit . Most bug reports should
+To report bugs, please visit . Most bug reports should
include preprocessed source files (use the :option:`-E` option) and the full
output of the compiler, along with information to reproduce.
diff --git a/clang/www/c_status.html b/clang/www/c_status.html
index 561f061c6449..42bc57d969ad 100644
--- a/clang/www/c_status.html
+++ b/clang/www/c_status.html
@@ -72,8 +72,8 @@ compliance between releases. We implement the resolution for defect
reports, but we do not currently track our DR status (help with
tracking DR status is appreciated).
-The LLVM bug tracker contains a
-Clang C component that tracks known bugs with Clang's language
+
The LLVM bug tracker uses
+the "c", "c11", "c18", and "c2x" labels to track known bugs with Clang's language
conformance.
C89 implementation status
diff --git a/clang/www/cxx_status.html b/clang/www/cxx_status.html
index 3cf12ff47721..5005ec6c08e4 100755
--- a/clang/www/cxx_status.html
+++ b/clang/www/cxx_status.html
@@ -76,9 +76,9 @@ as they become available.
Specifications that will help drive the future of the C++ programming
language.
-The LLVM bug tracker contains Clang
-C++ components that track known bugs with Clang's language conformance in
-each language mode.
+The LLVM bug tracker uses
+the "c++" label, as well as mode-specific labels such as "c++11", "c++14",
+and so on, to track known bugs with Clang's language conformance.
C++98 implementation status
diff --git a/clang/www/get_involved.html b/clang/www/get_involved.html
index 96784108ce6e..d6eddb8227a5 100755
--- a/clang/www/get_involved.html
+++ b/clang/www/get_involved.html
@@ -65,7 +65,7 @@ Clang developers, contributors and the standards they implement.
If you're looking for something to work on, check out our Open Projects page or look through the Bugzilla bug database.
+href="https://github.com/llvm/llvm-project/issues/">LLVM bug tracker.
Contributing Extensions to Clang
diff --git a/clang/www/get_started.html b/clang/www/get_started.html
index bc9629d7e2ff..ab5f7fac6a6c 100755
--- a/clang/www/get_started.html
+++ b/clang/www/get_started.html
@@ -19,7 +19,7 @@
options. This should get you up and running with the minimum of muss and fuss.
If you like what you see, please consider getting
involved with the Clang community. If you run into problems, please file
-bugs in LLVM Bugzilla.
+bugs on the LLVM bug tracker.
Release Clang Versions
diff --git a/clang/www/menu.html.incl b/clang/www/menu.html.incl
index 3a360dc3af85..72c483d27345 100755
--- a/clang/www/menu.html.incl
+++ b/clang/www/menu.html.incl
@@ -36,7 +36,7 @@
cfe-users List
cfe-dev List
cfe-commits List
- Bug Reports
+ Bug Reports
Planet Clang
IRC: irc.oftc.net#llvm
diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
index 6ed811fee1a8..817d6b42a5bc 100644
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -217,7 +217,7 @@ Quick Links
===========
* `LLVM Homepage `_
* `libc++abi Homepage `_
-* `LLVM Bugzilla `_
+* `LLVM bug tracker `_
* `libcxx-commits Mailing List`_
* `libcxx-dev Mailing List`_
* `Browse libc++ Sources `_
diff --git a/libunwind/docs/index.rst b/libunwind/docs/index.rst
index f7ff29d095bc..3597e757f59b 100644
--- a/libunwind/docs/index.rst
+++ b/libunwind/docs/index.rst
@@ -98,7 +98,7 @@ Please include [libunwind] in the subject.
Quick Links
===========
* `LLVM Homepage `_
-* `LLVM Bugzilla `_
+* `LLVM bug tracker `_
* `cfe-commits Mailing List`_
* `cfe-dev Mailing List`_
* `Browse libunwind Sources `_
diff --git a/lldb/docs/index.rst b/lldb/docs/index.rst
index 0ca444f31ed1..24643ce8bc02 100644
--- a/lldb/docs/index.rst
+++ b/lldb/docs/index.rst
@@ -178,4 +178,4 @@ interesting areas to contribute to lldb.
Source Code
Code Reviews
- Bug Reports
+ Bug Reports
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index af32d35521a3..edc2c8cded9c 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -234,7 +234,7 @@ option(LLVM_APPEND_VC_REV
set(PACKAGE_NAME LLVM)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set(PACKAGE_BUGREPORT "https://bugs.llvm.org/")
+set(PACKAGE_BUGREPORT "https://github.com/llvm/llvm-project/issues/")
set(BUG_REPORT_URL "${PACKAGE_BUGREPORT}" CACHE STRING
"Default URL where bug reports are to be submitted.")
diff --git a/llvm/docs/CommandGuide/llvm-install-name-tool.rst b/llvm/docs/CommandGuide/llvm-install-name-tool.rst
index 9309215cd6ab..ff42741b0352 100644
--- a/llvm/docs/CommandGuide/llvm-install-name-tool.rst
+++ b/llvm/docs/CommandGuide/llvm-install-name-tool.rst
@@ -76,7 +76,7 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
SEE ALSO
--------
diff --git a/llvm/docs/CommandGuide/llvm-libtool-darwin.rst b/llvm/docs/CommandGuide/llvm-libtool-darwin.rst
index ccdf464301ed..0fdd51da3092 100644
--- a/llvm/docs/CommandGuide/llvm-libtool-darwin.rst
+++ b/llvm/docs/CommandGuide/llvm-libtool-darwin.rst
@@ -97,7 +97,7 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
SEE ALSO
--------
diff --git a/llvm/docs/CommandGuide/llvm-lipo.rst b/llvm/docs/CommandGuide/llvm-lipo.rst
index 20b2984fc9b2..aeaaea9d6cda 100644
--- a/llvm/docs/CommandGuide/llvm-lipo.rst
+++ b/llvm/docs/CommandGuide/llvm-lipo.rst
@@ -70,4 +70,4 @@ COMMANDS
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
diff --git a/llvm/docs/CommandGuide/llvm-objcopy.rst b/llvm/docs/CommandGuide/llvm-objcopy.rst
index 5f3aa88405e2..21f1a53e593c 100644
--- a/llvm/docs/CommandGuide/llvm-objcopy.rst
+++ b/llvm/docs/CommandGuide/llvm-objcopy.rst
@@ -536,7 +536,7 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
There is a known issue with :option:`--input-target` and :option:`--target`
causing only ``binary`` and ``ihex`` formats to have any effect. Other values
diff --git a/llvm/docs/CommandGuide/llvm-objdump.rst b/llvm/docs/CommandGuide/llvm-objdump.rst
index bd4b77e52f24..cbc525fba8a6 100644
--- a/llvm/docs/CommandGuide/llvm-objdump.rst
+++ b/llvm/docs/CommandGuide/llvm-objdump.rst
@@ -397,7 +397,7 @@ XCOFF ONLY OPTIONS AND COMMANDS
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
SEE ALSO
--------
diff --git a/llvm/docs/CommandGuide/llvm-otool.rst b/llvm/docs/CommandGuide/llvm-otool.rst
index 3f6624e47462..c4673502d324 100644
--- a/llvm/docs/CommandGuide/llvm-otool.rst
+++ b/llvm/docs/CommandGuide/llvm-otool.rst
@@ -132,7 +132,7 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
SEE ALSO
--------
diff --git a/llvm/docs/CommandGuide/llvm-size.rst b/llvm/docs/CommandGuide/llvm-size.rst
index 3feed2810dfd..f244769545b3 100644
--- a/llvm/docs/CommandGuide/llvm-size.rst
+++ b/llvm/docs/CommandGuide/llvm-size.rst
@@ -191,4 +191,4 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
diff --git a/llvm/docs/CommandGuide/llvm-strings.rst b/llvm/docs/CommandGuide/llvm-strings.rst
index f66b22ec8df0..0a9ab5dca0c1 100644
--- a/llvm/docs/CommandGuide/llvm-strings.rst
+++ b/llvm/docs/CommandGuide/llvm-strings.rst
@@ -123,4 +123,4 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
diff --git a/llvm/docs/CommandGuide/llvm-strip.rst b/llvm/docs/CommandGuide/llvm-strip.rst
index 461fb828a2bb..ce5c824ecd5d 100644
--- a/llvm/docs/CommandGuide/llvm-strip.rst
+++ b/llvm/docs/CommandGuide/llvm-strip.rst
@@ -194,7 +194,7 @@ Otherwise, it exits with code 0.
BUGS
----
-To report bugs, please visit .
+To report bugs, please visit .
SEE ALSO
--------
diff --git a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
index 01c2d4e4d596..3182c4c1c026 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
@@ -8,7 +8,7 @@ write_cmake_config("Config") {
input = "config.h.cmake"
output = "$target_gen_dir/config.h"
values = [
- "BUG_REPORT_URL=https://bugs.llvm.org/",
+ "BUG_REPORT_URL=https://github.com/llvm/llvm-project/issues/",
"CLANG_DEFAULT_PIE_ON_LINUX=",
"CLANG_DEFAULT_LINKER=",
"CLANG_DEFAULT_STD_C=",
diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index 8e22f8984cf9..489d5abec9e2 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -72,7 +72,7 @@ write_cmake_config("config") {
input = "config.h.cmake"
output = "$target_gen_dir/config.h"
values = [
- "BUG_REPORT_URL=https://bugs.llvm.org/",
+ "BUG_REPORT_URL=https://github.com/llvm/llvm-project/issues/",
"ENABLE_BACKTRACES=1",
"ENABLE_CRASH_OVERRIDES=1",
"BACKTRACE_HEADER=execinfo.h",
@@ -120,7 +120,7 @@ write_cmake_config("config") {
"LLVM_VERSION_INFO=",
"LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO=1",
"LLVM_WINDOWS_PREFER_FORWARD_SLASH=",
- "PACKAGE_BUGREPORT=https://bugs.llvm.org/",
+ "PACKAGE_BUGREPORT=https://github.com/llvm/llvm-project/issues/",
"PACKAGE_NAME=LLVM",
"PACKAGE_STRING=LLVM ${llvm_version}git",
"PACKAGE_VERSION=${llvm_version}git",
diff --git a/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h b/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
index ee4c6277d2ae..ba28d8606265 100644
--- a/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
+++ b/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
@@ -20,7 +20,7 @@
#define CLANG_CONFIG_H
/* Bug report URL. */
-#define BUG_REPORT_URL "https://bugs.llvm.org/"
+#define BUG_REPORT_URL "https://github.com/llvm/llvm-project/issues/"
/* Default to -fPIE and -pie on Linux. */
#define CLANG_DEFAULT_PIE_ON_LINUX 0
diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
index 404501139494..45945510d02b 100644
--- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
+++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
@@ -24,7 +24,7 @@
#include "llvm/Config/llvm-config.h"
/* Bug report URL. */
-#define BUG_REPORT_URL "https://bugs.llvm.org/"
+#define BUG_REPORT_URL "https://github.com/llvm/llvm-project/issues/"
/* Define to 1 to enable backtraces, and to 0 otherwise. */
#define ENABLE_BACKTRACES 1
@@ -332,7 +332,7 @@
/* LTDL_SHLIB_EXT defined in Bazel */
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.llvm.org/"
+#define PACKAGE_BUGREPORT "https://github.com/llvm/llvm-project/issues/"
/* Define to the full name of this package. */
#define PACKAGE_NAME "LLVM"