Browse Source

rebase angle patch to latest HEAD

Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
Rebecca Chang Swee Fun 1 year ago
parent
commit
3d03ad2df2
1 changed files with 6 additions and 5 deletions
  1. 6 5
      third_party/0001-third-party-angle.patch

+ 6 - 5
third_party/0001-third-party-angle.patch

@@ -1,8 +1,8 @@
 diff --git a/BUILD.gn b/BUILD.gn
-index b92e52fc2..8fd77fe35 100644
+index 7bbf13c99..be55d871f 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -233,7 +233,12 @@ config("extra_warnings") {
+@@ -244,7 +244,13 @@ config("extra_warnings") {
        "-Wstrict-prototypes",
        "-Wunreachable-code-aggressive",
        "-Wshorten-64-to-32",
@@ -10,13 +10,14 @@ index b92e52fc2..8fd77fe35 100644
 +      # Workaround for clang unable to locate pci/pci.h header
 +      "-I../../build/linux/debian_sid_riscv64-sysroot/usr/include/riscv64-linux-gnu",
      ]
++
 +    # Workaround for linker unable to locate X11 related header
 +    ldflags = [ "-Wl,-L../../build/linux/debian_sid_riscv64-sysroot/usr/lib/riscv64-linux-gnu" ]
    }
  
    if (is_gcc) {
 diff --git a/gni/angle.gni b/gni/angle.gni
-index cbe35e044..ef47c651a 100644
+index 09acabb4a..14ba84aac 100644
 --- a/gni/angle.gni
 +++ b/gni/angle.gni
 @@ -77,7 +77,8 @@ declare_args() {
@@ -30,7 +31,7 @@ index cbe35e044..ef47c651a 100644
    } else if (current_cpu == "arm" || current_cpu == "x86" ||
               current_cpu == "mipsel" || current_cpu == "s390" ||
 diff --git a/src/common/platform.h b/src/common/platform.h
-index c39c7e040..b68561cbf 100644
+index c39c7e040..792c854c3 100644
 --- a/src/common/platform.h
 +++ b/src/common/platform.h
 @@ -101,8 +101,8 @@
@@ -39,7 +40,7 @@ index c39c7e040..b68561cbf 100644
  
 -// Mips and arm devices need to include stddef for size_t.
 -#if defined(__mips__) || defined(__arm__) || defined(__aarch64__)
-+// Mips, arm and riscv devices need to include stddef for size_t.
++// Mips and arm and riscv devices need to include stddef for size_t.
 +#if defined(__mips__) || defined(__arm__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64)
  #    include <stddef.h>
  #endif