diff --git a/clang/.SRCINFO b/clang/.SRCINFO
new file mode 100644
index 00000000..a0618c4f
--- /dev/null
+++ b/clang/.SRCINFO
@@ -0,0 +1,55 @@
+pkgbase = clang
+	pkgdesc = C language family frontend for LLVM
+	pkgver = 18.1.8
+	pkgrel = 3
+	url = https://clang.llvm.org/
+	arch = x86_64
+	license = Apache-2.0 WITH LLVM-exception
+	makedepends = llvm
+	makedepends = cmake
+	makedepends = ninja
+	makedepends = python-sphinx
+	makedepends = python-myst-parser
+	makedepends = lld
+	makedepends = clang
+	makedepends = llvm-libs
+	depends = llvm-libs
+	depends = gcc
+	depends = compiler-rt
+	optdepends = openmp: OpenMP support in clang with -fopenmp
+	optdepends = python: for scan-view and git-clang-format
+	optdepends = llvm: referenced by some clang headers
+	provides = clang-analyzer=18.1.8
+	provides = clang-tools-extra=18.1.8
+	conflicts = clang-analyzer
+	conflicts = clang-tools-extra
+	replaces = clang-analyzer
+	replaces = clang-tools-extra
+	options = !lto
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz.sig
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz.sig
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz.sig
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz.sig
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz.sig
+	source = clangd-handle-missing-ending-brace.patch::https://github.com/llvm/llvm-project/commit/9d1dada57741.patch
+	source = enable-fstack-protector-strong-by-default.patch
+	validpgpkeys = 474E22316ABF4785A88C6E8EA2C794A986419D8A
+	sha256sums = 5724fe0a13087d5579104cedd2f8b3bc10a212fb79a0fcdac98f4880e19f4519
+	sha256sums = SKIP
+	sha256sums = e58877fcd95ed106824bd1a31276dd17ed0c53adcd60ca75289eac0654f0a7f1
+	sha256sums = SKIP
+	sha256sums = f68cf90f369bc7d0158ba70d860b0cb34dbc163d6ff0ebc6cfa5e515b9b2e28d
+	sha256sums = SKIP
+	sha256sums = 59badef592dd34893cd319d42b323aaa990b452d05c7180ff20f23ab1b41e837
+	sha256sums = SKIP
+	sha256sums = b76b810f3d3dc5d08e83c4236cb6e395aa9bd5e3ea861e8c319b216d093db074
+	sha256sums = SKIP
+	sha256sums = c102e8a6a2adb0e8729865ffb8799b22bb8a9bdf0f421991880fa4393378370a
+	sha256sums = ef319e65f927718e1d3b1a23c480d686b1d292e2a0bf27229540964f9734117a
+
+pkgname = clang
diff --git a/clang/PKGBUILD b/clang/PKGBUILD
new file mode 100644
index 00000000..1631b84d
--- /dev/null
+++ b/clang/PKGBUILD
@@ -0,0 +1,193 @@
+# Maintainer: Evangelos Foutras <foutrelis@archlinux.org>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=clang
+pkgver=18.1.8
+pkgrel=3
+pkgdesc="C language family frontend for LLVM"
+arch=('x86_64')
+url="https://clang.llvm.org/"
+license=('Apache-2.0 WITH LLVM-exception')
+depends=('llvm-libs' 'gcc' 'compiler-rt')
+makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-myst-parser' 'lld' 'clang' 'llvm-libs')
+optdepends=('openmp: OpenMP support in clang with -fopenmp'
+            'python: for scan-view and git-clang-format'
+            'llvm: referenced by some clang headers')
+provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
+conflicts=('clang-analyzer' 'clang-tools-extra')
+replaces=('clang-analyzer' 'clang-tools-extra')
+options=(!lto) # We are using here ThinLTO, so disable pacman's LTO
+_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
+source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
+        $_source_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+        $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
+        $_source_base/cmake-$pkgver.src.tar.xz{,.sig}
+        $_source_base/third-party-$pkgver.src.tar.xz{,.sig}
+        clangd-handle-missing-ending-brace.patch::https://github.com/llvm/llvm-project/commit/9d1dada57741.patch
+        enable-fstack-protector-strong-by-default.patch)
+sha256sums=('5724fe0a13087d5579104cedd2f8b3bc10a212fb79a0fcdac98f4880e19f4519'
+            'SKIP'
+            'e58877fcd95ed106824bd1a31276dd17ed0c53adcd60ca75289eac0654f0a7f1'
+            'SKIP'
+            'f68cf90f369bc7d0158ba70d860b0cb34dbc163d6ff0ebc6cfa5e515b9b2e28d'
+            'SKIP'
+            '59badef592dd34893cd319d42b323aaa990b452d05c7180ff20f23ab1b41e837'
+            'SKIP'
+            'b76b810f3d3dc5d08e83c4236cb6e395aa9bd5e3ea861e8c319b216d093db074'
+            'SKIP'
+            'c102e8a6a2adb0e8729865ffb8799b22bb8a9bdf0f421991880fa4393378370a'
+            'ef319e65f927718e1d3b1a23c480d686b1d292e2a0bf27229540964f9734117a')
+validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
+
+# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid
+# installing static libraries; inspired by Gentoo
+_get_distribution_components() {
+  local target
+  ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r target; do
+    case $target in
+      clang-libraries|distribution)
+        continue
+        ;;
+      clang|clangd|clang-*)
+        ;;
+      clang*|findAllSymbols)
+        continue
+        ;;
+    esac
+    echo $target
+  done
+}
+
+prepare() {
+  rename -v -- "-$pkgver.src" '' {cmake,third-party}-$pkgver.src
+  cd clang-$pkgver.src
+  mkdir build
+  mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
+  patch -Np2 -i ../enable-fstack-protector-strong-by-default.patch
+
+  # https://github.com/clangd/clangd/issues/1559
+  sed 's|clang-tools-extra|clang/tools/extra|' \
+    clangd-handle-missing-ending-brace.patch | patch -Np2
+
+  # Attempt to convert script to Python 3
+  2to3 -wn --no-diffs \
+    tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+}
+
+build() {
+  cd clang-$pkgver.src/build
+
+  # Add dir for PGO data
+  mkdir $srcdir/clang-$pkgver.src/pgo
+
+  # Build only minimal debug info to reduce size
+  CFLAGS=${CFLAGS/-g /-g1 }
+  CXXFLAGS=${CXXFLAGS/-g /-g1 }
+
+  local cmake_args=(
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_DOCDIR=share/doc
+    -DCMAKE_SKIP_RPATH=ON
+    -DCLANG_DEFAULT_PIE_ON_LINUX=ON
+    -DCLANG_LINK_CLANG_DYLIB=ON
+    -DENABLE_LINKER_BUILD_ID=ON
+    -DLLVM_BUILD_DOCS=ON
+    -DLLVM_BUILD_TESTS=ON
+    -DLLVM_ENABLE_RTTI=ON
+    -DLLVM_ENABLE_SPHINX=ON
+    -DLLVM_EXTERNAL_LIT=/usr/bin/lit
+    -DLLVM_INCLUDE_DOCS=ON
+    -DLLVM_LINK_LLVM_DYLIB=ON
+    -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
+    -DSPHINX_WARNINGS_AS_ERRORS=OFF
+  )
+
+  # Use Clang as compiler
+  export AR=llvm-ar
+  export CC=clang
+  export CXX=clang++
+  export NM=llvm-nm
+  export RANLIB=llvm-ranlib
+  # Export Original CFLAGS
+  export ORIG_CFLAGS="${CFLAGS}"
+  export ORIG_CXXFLAGS="${CXXFLAGS}"
+  
+  # Flags for profile generation
+  export CFLAGS+=" -fprofile-generate"
+  export CXXFLAGS+=" -fprofile-generate"
+
+  cmake .. "${cmake_args[@]}"
+  local distribution_components=$(_get_distribution_components | paste -sd\;)
+  test -n "$distribution_components"
+  cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components")
+
+  # Intrumented build
+  cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_INSTRUMENTED=IR -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_USE_LINKER=lld -DLLVM_VP_COUNTERS_PER_SITE=6 "${cmake_args[@]}"
+  ninja
+
+  # Workload for PGO profiles
+  # Might want to be increased in the future
+  LD_LIBRARY_PATH=$PWD/lib ninja check-clang{,-tools} || true
+  unset LD_LIBRARY_PATH
+
+  # Move all profiles into PGO dir
+  # Somehow defining the dir did not work, therefore we use that hacky workaround
+  find . -name "*.profraw" -exec mv {} "$srcdir/clang-$pkgver.src/pgo" \;
+  
+  # Merge the generated profile
+  llvm-profdata merge -o "${srcdir}/clang-$pkgver.src/pgo/llvm.profdata" "$srcdir/clang-$pkgver.src/pgo"/*.profraw
+
+  # Use Original CFLAGS again and enable ThinLTO + use the profile
+  export PGO_PROFILE="${srcdir}/clang-$pkgver.src/pgo/llvm.profdata"
+  export CFLAGS="${ORIG_CFLAGS} -fprofile-use=$PGO_PROFILE"
+  export CXXFLAGS="${ORIG_CXXFLAGS} -fprofile-use=$PGO_PROFILE"
+  export LDFLAGS="$LDFLAGS -flto=thin"
+
+  cd ..
+  mkdir build-pgo-use
+  cd build-pgo-use
+  # Enable ThinLTO and use profile
+  cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_USE_LINKER=lld -DLLVM_ENABLE_LTO=Thin -DLLVM_PROFDATA_FILE=$PGO_PROFILE "${cmake_args[@]}"
+  ninja
+}
+
+check() {
+  cd clang-$pkgver.src/build-pgo-use
+  LD_LIBRARY_PATH=$PWD/lib ninja check-clang{,-tools}
+}
+
+_python_optimize() {
+  python -m compileall "$@"
+  python -O -m compileall "$@"
+  python -OO -m compileall "$@"
+}
+
+package() {
+  cd clang-$pkgver.src/build-pgo-use
+
+  DESTDIR="$pkgdir" ninja install-distribution
+  install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Remove documentation sources
+  rm -r "$pkgdir"/usr/share/doc/clang{,-tools}/html/{_sources,.buildinfo}
+
+  # Move scanbuild-py into site-packages and install Python bindings
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  install -d "$pkgdir/$site_packages"
+  mv "$pkgdir"/usr/lib/{libear,libscanbuild} "$pkgdir/$site_packages/"
+  cp -a ../bindings/python/clang "$pkgdir/$site_packages/"
+
+  # Move analyzer scripts out of /usr/libexec
+  mv "$pkgdir"/usr/libexec/* "$pkgdir/usr/lib/clang/"
+  rmdir "$pkgdir/usr/libexec"
+  sed -i 's|libexec|lib/clang|' \
+    "$pkgdir/usr/bin/scan-build" \
+    "$pkgdir/$site_packages/libscanbuild/analyze.py"
+
+  # Compile Python scripts
+  _python_optimize "$pkgdir/usr/share" "$pkgdir/$site_packages"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/clang/clangd-handle-missing-ending-brace.patch b/clang/clangd-handle-missing-ending-brace.patch
new file mode 100644
index 00000000..4e79205d
--- /dev/null
+++ b/clang/clangd-handle-missing-ending-brace.patch
@@ -0,0 +1,78 @@
+From 9d1dada57741d204f8a95aa2b0c89a7242e101f1 Mon Sep 17 00:00:00 2001
+From: Nathan Ridge <zeratul976@hotmail.com>
+Date: Thu, 18 Jan 2024 01:51:43 -0500
+Subject: [PATCH] [clangd] Handle an expanded token range that ends in the
+ `eof` token in TokenBuffer::spelledForExpanded() (#78092)
+
+Such ranges can legitimately arise in the case of invalid code, such as
+a declaration missing an ending brace.
+
+Fixes https://github.com/clangd/clangd/issues/1559
+---
+ clang-tools-extra/clangd/unittests/DumpASTTests.cpp | 11 +++++++++++
+ clang/lib/Tooling/Syntax/Tokens.cpp                 |  6 ++++++
+ clang/unittests/Tooling/Syntax/TokensTest.cpp       | 12 ++++++++++++
+ 3 files changed, 29 insertions(+)
+
+diff --git a/clang-tools-extra/clangd/unittests/DumpASTTests.cpp b/clang-tools-extra/clangd/unittests/DumpASTTests.cpp
+index d1b8f21b82c65a..304682118c871d 100644
+--- a/clang-tools-extra/clangd/unittests/DumpASTTests.cpp
++++ b/clang-tools-extra/clangd/unittests/DumpASTTests.cpp
+@@ -186,6 +186,17 @@ TEST(DumpASTTests, Arcana) {
+   EXPECT_THAT(Node.children.front().arcana, testing::StartsWith("QualType "));
+ }
+ 
++TEST(DumpASTTests, UnbalancedBraces) {
++  // Test that we don't crash while trying to compute a source range for the
++  // node whose ending brace is missing, and also that the source range is
++  // not empty.
++  Annotations Case("/*error-ok*/ $func[[int main() {]]");
++  ParsedAST AST = TestTU::withCode(Case.code()).build();
++  auto Node = dumpAST(DynTypedNode::create(findDecl(AST, "main")),
++                      AST.getTokens(), AST.getASTContext());
++  ASSERT_EQ(Node.range, Case.range("func"));
++}
++
+ } // namespace
+ } // namespace clangd
+ } // namespace clang
+diff --git a/clang/lib/Tooling/Syntax/Tokens.cpp b/clang/lib/Tooling/Syntax/Tokens.cpp
+index 2f28b9cf286a63..8d32c45a4a70cf 100644
+--- a/clang/lib/Tooling/Syntax/Tokens.cpp
++++ b/clang/lib/Tooling/Syntax/Tokens.cpp
+@@ -401,6 +401,12 @@ std::string TokenBuffer::Mapping::str() const {
+ 
+ std::optional<llvm::ArrayRef<syntax::Token>>
+ TokenBuffer::spelledForExpanded(llvm::ArrayRef<syntax::Token> Expanded) const {
++  // In cases of invalid code, AST nodes can have source ranges that include
++  // the `eof` token. As there's no spelling for this token, exclude it from
++  // the range.
++  if (!Expanded.empty() && Expanded.back().kind() == tok::eof) {
++    Expanded = Expanded.drop_back();
++  }
+   // Mapping an empty range is ambiguous in case of empty mappings at either end
+   // of the range, bail out in that case.
+   if (Expanded.empty())
+diff --git a/clang/unittests/Tooling/Syntax/TokensTest.cpp b/clang/unittests/Tooling/Syntax/TokensTest.cpp
+index 0c08318a637c0b..42f51697139658 100644
+--- a/clang/unittests/Tooling/Syntax/TokensTest.cpp
++++ b/clang/unittests/Tooling/Syntax/TokensTest.cpp
+@@ -816,6 +816,18 @@ TEST_F(TokenBufferTest, SpelledByExpanded) {
+   EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("prev good")), std::nullopt);
+ }
+ 
++TEST_F(TokenBufferTest, NoCrashForEofToken) {
++  recordTokens(R"cpp(
++    int main() {
++  )cpp");
++  ASSERT_TRUE(!Buffer.expandedTokens().empty());
++  ASSERT_EQ(Buffer.expandedTokens().back().kind(), tok::eof);
++  // Expanded range including `eof` is handled gracefully (`eof` is ignored).
++  EXPECT_THAT(
++      Buffer.spelledForExpanded(Buffer.expandedTokens()),
++      ValueIs(SameRange(Buffer.spelledTokens(SourceMgr->getMainFileID()))));
++}
++
+ TEST_F(TokenBufferTest, ExpandedTokensForRange) {
+   recordTokens(R"cpp(
+     #define SIGN(X) X##_washere
diff --git a/clang/enable-fstack-protector-strong-by-default.patch b/clang/enable-fstack-protector-strong-by-default.patch
new file mode 100644
index 00000000..7c7fc311
--- /dev/null
+++ b/clang/enable-fstack-protector-strong-by-default.patch
@@ -0,0 +1,72 @@
+From 669e0924afcedf27350469a944267cad4aabb866 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutras.com>
+Date: Sun, 30 Jun 2024 08:51:20 +0000
+Subject: [PATCH] Enable -fstack-protector-strong by default
+
+---
+ clang/lib/Driver/ToolChains/Linux.h | 5 +++++
+ clang/test/Driver/fsanitize.c       | 6 +++---
+ clang/test/Driver/stack-protector.c | 4 ++--
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
+index 524391743090..0d4e1944118b 100644
+--- a/clang/lib/Driver/ToolChains/Linux.h
++++ b/clang/lib/Driver/ToolChains/Linux.h
+@@ -10,6 +10,7 @@
+ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
+ 
+ #include "Gnu.h"
++#include "clang/Basic/LangOptions.h"
+ #include "clang/Driver/ToolChain.h"
+ 
+ namespace clang {
+@@ -48,6 +49,10 @@ public:
+   IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const override;
+   bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
+   bool IsMathErrnoDefault() const override;
++  LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    return LangOptions::SSPStrong;
++  }
+   SanitizerMask getSupportedSanitizers() const override;
+   void addProfileRTLibs(const llvm::opt::ArgList &Args,
+                         llvm::opt::ArgStringList &CmdArgs) const override;
+diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
+index 1671825042c3..5d8ac7009f8c 100644
+--- a/clang/test/Driver/fsanitize.c
++++ b/clang/test/Driver/fsanitize.c
+@@ -700,12 +700,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+ 
+-// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: not %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang --target=x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+ // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address'
+diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
+index 169376919a71..2470b7f7e39e 100644
+--- a/clang/test/Driver/stack-protector.c
++++ b/clang/test/Driver/stack-protector.c
+@@ -3,11 +3,11 @@
+ // NOSSP-NOT: "-stack-protector-buffer-size" 
+ 
+ // RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
+-// SSP: "-stack-protector" "1"
++// SSP: "-stack-protector" "2"
+ // SSP-NOT: "-stack-protector-buffer-size" 
+ 
+ // RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
+-// SSP-BUF: "-stack-protector" "1"
++// SSP-BUF: "-stack-protector" "2"
+ // SSP-BUF: "-stack-protector-buffer-size" "16" 
+ 
+ // RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD