From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Thu, 7 Jan 2021 12:08:42 +0000 (+0000)
Subject: Adapt asm output of clang that no #/$ is placed before data
X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~12^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2e15320b3c00d0640a9718be67465ae08fd5094;p=android-platform-art.git

Adapt asm output of clang that no #/$ is placed before data

Forwarded: not-needed


Gbp-Pq: Name adapt-asm-output-of-clang-that-no-is-placed-before-data.patch
---

diff --git a/tools/cpp-define-generator/make_header.py b/tools/cpp-define-generator/make_header.py
index 1b13923..ca87e5e 100755
--- a/tools/cpp-define-generator/make_header.py
+++ b/tools/cpp-define-generator/make_header.py
@@ -31,7 +31,7 @@ import sys
 def convert(input):
   """Find all defines in the compiler generated assembly and convert them to #define pragmas"""
 
-  asm_define_re = re.compile(r'">>(\w+) (?:\$|#)([-0-9]+) (?:\$|#)(0|1)<<"')
+  asm_define_re = re.compile(r'">>(\w+) (?:\$|#|)([-0-9]+) (?:\$|#|)(0|1)<<"')
   asm_defines = asm_define_re.findall(input)
   if not asm_defines:
     raise RuntimeError("Failed to find any asm defines in the input")