add support for LLVM=1

Issue #300
ClangBuiltLinux · Aug 20, 2020 · b319a1e · b319a1e
1 parent c36a087
commit b319a1e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -202,6 +202,7 @@ script:
     docker run \
         --env ARCH=${ARCH} \
         --env LD=${LD} \
+        --env LLVM=${LLVM} \
         --env LLVM_IAS=${LLVM_IAS} \
         --env REPO=${REPO} \
         --env BOOT=${BOOT} \

diff --git a/driver.sh b/driver.sh
@@ -5,7 +5,7 @@ set -eu
 setup_variables() {
     while [[ ${#} -ge 1 ]]; do
         case ${1} in
-            "AR="* | "ARCH="* | "CC="* | "LD="* | "LLVM_IAS="* | "NM"=* | "OBJCOPY"=* | "OBJDUMP"=* | "OBJSIZE"=* | "REPO="* | "STRIP"=*) export "${1?}" ;;
+            "AR="* | "ARCH="* | "CC="* | "LD="* | "LLVM="* | "LLVM_IAS="* | "NM"=* | "OBJCOPY"=* | "OBJDUMP"=* | "OBJSIZE"=* | "REPO="* | "STRIP"=*) export "${1?}" ;;
             "-c" | "--clean") cleanup=true ;;
             "-j" | "--jobs")
                 shift
@@ -339,26 +339,38 @@ check_objcopy_strip_version() {
     done
 }
 mako_reactor() {
-    # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/kbuild/kbuild.txt
-    time \
-        KBUILD_BUILD_TIMESTAMP="Thu Jan  1 00:00:00 UTC 1970" \
-        KBUILD_BUILD_USER=driver \
-        KBUILD_BUILD_HOST=clangbuiltlinux \
-        make -j"${jobs:-$(nproc)}" \
-        AR="${AR}" \
-        CC="${CC}" \
-        HOSTCC="${CC}" \
-        HOSTLD="${HOSTLD:-ld}" \
-        KCFLAGS="-Wno-implicit-fallthrough" \
-        LD="${LD}" \
-        LLVM_IAS="${LLVM_IAS}" \
-        NM="${NM}" \
-        OBJCOPY="${OBJCOPY}" \
-        OBJDUMP="${OBJDUMP}" \
-        OBJSIZE="${OBJSIZE}" \
-        READELF="${READELF}" \
-        STRIP="${STRIP}" \
-        "${@}"
+    if [[ ${LLVM:-0} -eq "1" ]]; then
+        echo "LLVM set to 1"
+        time \
+            KBUILD_BUILD_TIMESTAMP="Thu Jan  1 00:00:00 UTC 1970" \
+            KBUILD_BUILD_USER=driver \
+            KBUILD_BUILD_HOST=clangbuiltlinux \
+            make -j"${jobs:-$(nproc)}" \
+            LLVM=1 \
+            LLVM_IAS="${LLVM_IAS}" \
+            "${@}"
+    else
+        # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/kbuild/kbuild.txt
+        time \
+            KBUILD_BUILD_TIMESTAMP="Thu Jan  1 00:00:00 UTC 1970" \
+            KBUILD_BUILD_USER=driver \
+            KBUILD_BUILD_HOST=clangbuiltlinux \
+            make -j"${jobs:-$(nproc)}" \
+            AR="${AR}" \
+            CC="${CC}" \
+            HOSTCC="${CC}" \
+            HOSTLD="${HOSTLD:-ld}" \
+            KCFLAGS="-Wno-implicit-fallthrough" \
+            LD="${LD}" \
+            LLVM_IAS="${LLVM_IAS}" \
+            NM="${NM}" \
+            OBJCOPY="${OBJCOPY}" \
+            OBJDUMP="${OBJDUMP}" \
+            OBJSIZE="${OBJSIZE}" \
+            READELF="${READELF}" \
+            STRIP="${STRIP}" \
+            "${@}"
+    fi
 }
 
 apply_patches() {

diff --git a/usage.txt b/usage.txt
@@ -20,6 +20,9 @@ Environment variables:
       If no CC value is specified, clang is used.
   LD:
       If no LD value is specified, ${CROSS_COMPILE}ld is used.
+  LLVM:
+      If this is set to 1, all LLVM utilities are used, except for the
+      integrated assembler. Use LLVM_IAS=1 to enable that.
   LLVM_IAS:
       If this is set to 1, the integrated assembler is used. No value means
       ${CROSS_COMPILE}as is used for assembling.