run runtime/interpreter/mterp/replace-ubfx.py on generated mterp.S file.

diff --git a/debian/changelog b/debian/changelog
index 9b46b12cf814f5d48081f3c8f7b120194d2fdaea..f2d2965cd688ad3f3ee287162dadb9be4f3ad68e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ android-platform-art (10.0.0+r36-3+rpi1) bullseye-staging; urgency=medium
     armv7 content, i suspect that is a lesser evil than not having
     the package at all).
 
+  [changes introduced in 10.0.0+r36-3+rpi1 by Peter Michael Green]
+  * run runtime/interpreter/mterp/replace-ubfx.py on generated mterp.S file.
+
  -- Raspbian forward porter <plugwash@raspbian.org>  Sat, 23 Jan 2021 10:18:40 +0000
 
 android-platform-art (10.0.0+r36-3) unstable; urgency=medium

diff --git a/debian/libart.mk b/debian/libart.mk
index 5292682ca98f12e68c9573d214e8e381eb96d8c4..5c4db1de1c92b6207f9d30e1082eb784caab7ec8 100644 (file)
--- a/debian/libart.mk
+++ b/debian/libart.mk
@@ -504,6 +504,7 @@ debian/out/operator_out.cc: $(SOURCES_OPERATOR)
 
 debian/out/mterp.S: runtime/interpreter/mterp/$(CPU)/*.S
        python3 runtime/interpreter/mterp/gen_mterp.py $@ $^
+       python3 runtime/interpreter/mterp/replace-ubfx.py debian/out/mterp.S | sponge debian/out/mterp.S
 
 debian/out/asm_defines.h: debian/out/asm_defines.output
        python3 tools/cpp-define-generator/make_header.py $^ > $@