Simple documentation update based on usage of GIT by both
LLVM and GCC.
libsanitizer/ChangeLog:
* HOWTO_MERGE: Do not mention not existing argument.
* README.gcc: Update LLVM repository location.
---
libsanitizer/HOWTO_MERGE | 3 +--
libsanitizer/README.gcc | 16 ++++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/libsanitizer/HOWTO_MERGE b/libsanitizer/HOWTO_MERGE
index a47a26a4a74..73cce4f6f7d 100644
--- a/libsanitizer/HOWTO_MERGE
+++ b/libsanitizer/HOWTO_MERGE
@@ -3,8 +3,7 @@ track various ABI changes and GCC-specific patches carefully.
Here is a
general list of actions required to perform the merge:
* Checkout recent GCC tree.
-* Run merge.sh script from libsanitizer directory. The script accepts one
- argument that is control version system (svn or git).
+* Run merge.sh script from libsanitizer directory.
* Modify Makefile.am files into
asan/tsan/lsan/ubsan/sanitizer_common/interception
directories if needed. In particular, you may need to add new source files
and remove old ones in source files list, add new flags to {C, CXX}FLAGS if
diff --git a/libsanitizer/README.gcc b/libsanitizer/README.gcc
index ec491ba4bf8..fdb0ec5ba09 100644
--- a/libsanitizer/README.gcc
+++ b/libsanitizer/README.gcc
@@ -3,14 +3,14 @@ projects initially developed by Google Inc.
Both tools consist of a compiler module and a run-time library.
The sources of the run-time library for these projects are hosted at
-https://llvm.org/svn/llvm-project/compiler-rt in the following directories:
- include/sanitizer
- lib/sanitizer_common
- lib/interception
- lib/asan
- lib/tsan
- lib/lsan
- lib/ubsan
+https://github.com/llvm/llvm-project in the following directories:
+ compiler-rt/include/sanitizer
+ compiler-rt/lib/sanitizer_common
+ compiler-rt/lib/interception
+ compiler-rt/lib/asan
+ compiler-rt/lib/tsan
+ compiler-rt/lib/lsan
+ compiler-rt/lib/ubsan
Trivial and urgent fixes (portability, build fixes, etc.) may go directly to the
GCC tree. All non-trivial changes, functionality improvements, etc. should go
--
2.26.2
