From 365b04fc0de0f7be0bba27f00a7e14e4f531e178 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 23 Jan 2021 11:13:54 +0000 Subject: [PATCH] Clean/fixup quilt dir. --- ...99c82257780931f80c66f84ab10b3eb-1611398508 | 80 ------------------- debian/patches/series | 5 +- 2 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 debian/patches/auto-10.0.0+r36-3+rpi1-48ad93a9499c82257780931f80c66f84ab10b3eb-1611398508 diff --git a/debian/patches/auto-10.0.0+r36-3+rpi1-48ad93a9499c82257780931f80c66f84ab10b3eb-1611398508 b/debian/patches/auto-10.0.0+r36-3+rpi1-48ad93a9499c82257780931f80c66f84ab10b3eb-1611398508 deleted file mode 100644 index 1b1f85d..0000000 --- a/debian/patches/auto-10.0.0+r36-3+rpi1-48ad93a9499c82257780931f80c66f84ab10b3eb-1611398508 +++ /dev/null @@ -1,80 +0,0 @@ -From: Raspbian forward porter -Subject: Automatically generated patch (10.0.0+r36-3+rpi1) - -Last (up to) 3 git changes, FYI: - -commit 48ad93a9499c82257780931f80c66f84ab10b3eb -Author: Peter Michael Green -Date: Sat Jan 23 10:38:45 2021 +0000 - - temp disable patch - -commit 811937efccfc7260fac15c96c4ffbaabf7fabbd1 -Merge: b02757e d9712c0 -Author: Peter Michael Green -Date: Sat Jan 23 10:27:38 2021 +0000 - - Manual merge of version 8.1.0+r23-3+rpi2 and 10.0.0+r36-3 to produce 10.0.0+r36-3+rpi1 - -commit d9712c0c93bb0c2dc411e7bced6aa61702797fd1 -Merge: 6d75632 8656c47 -Author: Hans-Christoph Steiner -Date: Thu Jan 7 12:08:42 2021 +0000 - - Merge android-platform-art (10.0.0+r36-3) import into refs/heads/workingbranch ---- - ---- /dev/null -+++ android-platform-art-10.0.0+r36/runtime/interpreter/mterp/replace-ubfx.py -@@ -0,0 +1,51 @@ -+#!/usr/bin/python3 -+#script to replace ubfx with equivilent code for older arm -+#note: these replacements will unfortunately clobber the carry -+#flag, I hope that doesn't break anything. -+#Copyright 2019 Peter Michael Green -+# -+#Permission is hereby granted, free of charge, to any person obtaining a copy of -+#this software and associated documentation files (the "Software"), to deal in -+#the Software without restriction, including without limitation the rights to -+#use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+#of the Software, and to permit persons to whom the Software is furnished to do -+#so, subject to the following conditions: -+# -+#The above copyright notice and this permission notice shall be included in all -+#copies or substantial portions of the Software. -+# -+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+#SOFTWARE. -+import sys -+ -+f = open(sys.argv[1],"r") -+for line in f: -+ line = line.rstrip() -+ linels = line.lstrip() -+ linesplit = linels.split() -+ if (len(linesplit) > 0) and ((linesplit[0] == 'ubfx') or (linesplit[0] == 'sbfx')): -+ linestartwhitespace = line[:(len(line)-len(linels))] -+ destreg = linesplit[1][:-1] -+ sourcereg = linesplit[2][:-1] -+ lsb = int(linesplit[3][1:-1]) -+ width = int(linesplit[4][1:]) -+ #print(linesplit) -+ #print((destreg,sourcereg,lsb,width)) -+ print(linestartwhitespace+'@ begin replacement of '+linels) -+ print(linestartwhitespace+'lsl '+destreg+', '+sourcereg+', #'+str(32-width-lsb)) -+ if linesplit[0] == 'ubfx': -+ rightshift = 'lsr' -+ else: -+ rightshift = 'asr' -+ print(linestartwhitespace+rightshift+' '+destreg+', '+destreg+', #'+str(32-width)) -+ print(linestartwhitespace+'@ end replacement of '+linels) -+ else: -+ print(line) -+f.close() -+ -+ diff --git a/debian/patches/series b/debian/patches/series index 654648e..86eeb04 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ workaround-cacheflush-on-arm.patch adapt-asm-output-of-clang-that-no-is-placed-before-data.patch arm-asm-instruction.patch fix-mterp-assembly-to-use-uxtw-instead-of-lsl-where-needed.patch -#hack-out-ubfx-and-sbfx.patch -#replace-movw.patch +hack-out-ubfx-and-sbfx.patch +replace-movw.patch #dont-tag-asm-as-armv7.patch -auto-10.0.0+r36-3+rpi1-48ad93a9499c82257780931f80c66f84ab10b3eb-1611398508 -- 2.30.2