Update build-tools to ab/8998930

https://ci.android.com/builds/branches/aosp-build-tools-release/grid?head=8998930&tail=8998930

Test: treehugger
Change-Id: Ic6eab73df8a41dd1b47cadb4d3dd7ef86dc0bbed

36 files changed, 24 insertions, 72 deletions

diff --git a/sysroots/aarch64-linux-musl/lib/Scrt1-real.o b/sysroots/aarch64-linux-musl/lib/Scrt1-real.o
index 82c1454e..ca45a161 100644
--- a/sysroots/aarch64-linux-musl/lib/Scrt1-real.o
+++ b/sysroots/aarch64-linux-musl/lib/Scrt1-real.o
diff --git a/sysroots/aarch64-linux-musl/lib/Scrt1.o b/sysroots/aarch64-linux-musl/lib/Scrt1.o
index 244e2907..1bc4e417 100644
--- a/sysroots/aarch64-linux-musl/lib/Scrt1.o
+++ b/sysroots/aarch64-linux-musl/lib/Scrt1.o
@@ -1,2 +1,2 @@
 GROUP ( Scrt1-real.o libc_musl_linker_object.o )
-INCLUDE linker.script
+INCLUDE relinterp.script
diff --git a/sysroots/aarch64-linux-musl/lib/crt1.o b/sysroots/aarch64-linux-musl/lib/crt1.o
index 0fbdfc45..1146244d 100644
--- a/sysroots/aarch64-linux-musl/lib/crt1.o
+++ b/sysroots/aarch64-linux-musl/lib/crt1.o
diff --git a/sysroots/aarch64-linux-musl/lib/libc.a b/sysroots/aarch64-linux-musl/lib/libc.a
index e60f2834..d769ea2c 100644
--- a/sysroots/aarch64-linux-musl/lib/libc.a
+++ b/sysroots/aarch64-linux-musl/lib/libc.a
diff --git a/sysroots/aarch64-linux-musl/lib/libc_musl.so b/sysroots/aarch64-linux-musl/lib/libc_musl.so
index fb449ec7..1b50109e 100755
--- a/sysroots/aarch64-linux-musl/lib/libc_musl.so
+++ b/sysroots/aarch64-linux-musl/lib/libc_musl.so
diff --git a/sysroots/aarch64-linux-musl/lib/libc_musl_linker_object.o b/sysroots/aarch64-linux-musl/lib/libc_musl_linker_object.o
index e5a81e62..f8d03056 100644
--- a/sysroots/aarch64-linux-musl/lib/libc_musl_linker_object.o
+++ b/sysroots/aarch64-linux-musl/lib/libc_musl_linker_object.o
diff --git a/sysroots/aarch64-linux-musl/lib/linker.script b/sysroots/aarch64-linux-musl/lib/linker.script
deleted file mode 100755
index 2612366a..00000000
--- a/sysroots/aarch64-linux-musl/lib/linker.script
+++ /dev/null
@@ -1,17 +0,0 @@
-ENTRY(__dlwrap__start)
-SECTIONS {
-  .linker_r 0x1000 : {
-    KEEP(*(.linker_r));
-  }
-  .linker_rx 0x5e2c4 : {
-    KEEP(*(.linker_rx));
-  }
-  .linker_rw 0x1290a0 : {
-    KEEP(*(.linker_rw));
-  }
-  .linker_rw2 0x139828 : {
-    KEEP(*(.linker_rw2));
-  }
-  /DISCARD/ : { *(.interp) }
-}
-INSERT BEFORE .note.android.embedded_linker;
diff --git a/sysroots/aarch64-linux-musl/lib/rcrt1.o b/sysroots/aarch64-linux-musl/lib/rcrt1.o
index f0ceb998..abaa99b1 100644
--- a/sysroots/aarch64-linux-musl/lib/rcrt1.o
+++ b/sysroots/aarch64-linux-musl/lib/rcrt1.o
diff --git a/sysroots/aarch64-linux-musl/lib/relinterp.script b/sysroots/aarch64-linux-musl/lib/relinterp.script
new file mode 100644
index 00000000..6b07e501
--- /dev/null
+++ b/sysroots/aarch64-linux-musl/lib/relinterp.script
@@ -0,0 +1,5 @@
+ENTRY(__ri__start)
+SECTIONS {
+  /DISCARD/ : { *(.interp) }
+}
+INSERT BEFORE .note.google.relinterp;
diff --git a/sysroots/arm-linux-musleabihf/lib/Scrt1-real.o b/sysroots/arm-linux-musleabihf/lib/Scrt1-real.o
index 6eadaa65..2c0dce04 100644
--- a/sysroots/arm-linux-musleabihf/lib/Scrt1-real.o
+++ b/sysroots/arm-linux-musleabihf/lib/Scrt1-real.o
diff --git a/sysroots/arm-linux-musleabihf/lib/Scrt1.o b/sysroots/arm-linux-musleabihf/lib/Scrt1.o
index 244e2907..1bc4e417 100644
--- a/sysroots/arm-linux-musleabihf/lib/Scrt1.o
+++ b/sysroots/arm-linux-musleabihf/lib/Scrt1.o
@@ -1,2 +1,2 @@
 GROUP ( Scrt1-real.o libc_musl_linker_object.o )
-INCLUDE linker.script
+INCLUDE relinterp.script
diff --git a/sysroots/arm-linux-musleabihf/lib/crt1.o b/sysroots/arm-linux-musleabihf/lib/crt1.o
index 57e03772..632ad4cf 100644
--- a/sysroots/arm-linux-musleabihf/lib/crt1.o
+++ b/sysroots/arm-linux-musleabihf/lib/crt1.o
diff --git a/sysroots/arm-linux-musleabihf/lib/libc.a b/sysroots/arm-linux-musleabihf/lib/libc.a
index a01b90bc..87a1a5a1 100644
--- a/sysroots/arm-linux-musleabihf/lib/libc.a
+++ b/sysroots/arm-linux-musleabihf/lib/libc.a
diff --git a/sysroots/arm-linux-musleabihf/lib/libc_musl.so b/sysroots/arm-linux-musleabihf/lib/libc_musl.so
index 6b1d7da7..dde87c2e 100755
--- a/sysroots/arm-linux-musleabihf/lib/libc_musl.so
+++ b/sysroots/arm-linux-musleabihf/lib/libc_musl.so
diff --git a/sysroots/arm-linux-musleabihf/lib/libc_musl_linker_object.o b/sysroots/arm-linux-musleabihf/lib/libc_musl_linker_object.o
index 0bca7d42..0ebb33f5 100644
--- a/sysroots/arm-linux-musleabihf/lib/libc_musl_linker_object.o
+++ b/sysroots/arm-linux-musleabihf/lib/libc_musl_linker_object.o
diff --git a/sysroots/arm-linux-musleabihf/lib/linker.script b/sysroots/arm-linux-musleabihf/lib/linker.script
deleted file mode 100755
index adee87b5..00000000
--- a/sysroots/arm-linux-musleabihf/lib/linker.script
+++ /dev/null
@@ -1,17 +0,0 @@
-ENTRY(__dlwrap__start)
-SECTIONS {
-  .linker_r 0x1000 : {
-    KEEP(*(.linker_r));
-  }
-  .linker_rx 0x560ac : {
-    KEEP(*(.linker_rx));
-  }
-  .linker_rw 0x12a030 : {
-    KEEP(*(.linker_rw));
-  }
-  .linker_rw2 0x13a500 : {
-    KEEP(*(.linker_rw2));
-  }
-  /DISCARD/ : { *(.interp) }
-}
-INSERT BEFORE .note.android.embedded_linker;
diff --git a/sysroots/arm-linux-musleabihf/lib/rcrt1.o b/sysroots/arm-linux-musleabihf/lib/rcrt1.o
index 4852e613..5af85e94 100644
--- a/sysroots/arm-linux-musleabihf/lib/rcrt1.o
+++ b/sysroots/arm-linux-musleabihf/lib/rcrt1.o
diff --git a/sysroots/arm-linux-musleabihf/lib/relinterp.script b/sysroots/arm-linux-musleabihf/lib/relinterp.script
new file mode 100644
index 00000000..6b07e501
--- /dev/null
+++ b/sysroots/arm-linux-musleabihf/lib/relinterp.script
@@ -0,0 +1,5 @@
+ENTRY(__ri__start)
+SECTIONS {
+  /DISCARD/ : { *(.interp) }
+}
+INSERT BEFORE .note.google.relinterp;
diff --git a/sysroots/i686-linux-musl/lib/Scrt1-real.o b/sysroots/i686-linux-musl/lib/Scrt1-real.o
index 375d5f66..78b6e36c 100644
--- a/sysroots/i686-linux-musl/lib/Scrt1-real.o
+++ b/sysroots/i686-linux-musl/lib/Scrt1-real.o
diff --git a/sysroots/i686-linux-musl/lib/Scrt1.o b/sysroots/i686-linux-musl/lib/Scrt1.o
index 244e2907..1bc4e417 100644
--- a/sysroots/i686-linux-musl/lib/Scrt1.o
+++ b/sysroots/i686-linux-musl/lib/Scrt1.o
@@ -1,2 +1,2 @@
 GROUP ( Scrt1-real.o libc_musl_linker_object.o )
-INCLUDE linker.script
+INCLUDE relinterp.script
diff --git a/sysroots/i686-linux-musl/lib/crt1.o b/sysroots/i686-linux-musl/lib/crt1.o
index c007151e..e28a28a6 100644
--- a/sysroots/i686-linux-musl/lib/crt1.o
+++ b/sysroots/i686-linux-musl/lib/crt1.o
diff --git a/sysroots/i686-linux-musl/lib/libc.a b/sysroots/i686-linux-musl/lib/libc.a
index 9ed6fd0b..4788873b 100644
--- a/sysroots/i686-linux-musl/lib/libc.a
+++ b/sysroots/i686-linux-musl/lib/libc.a
diff --git a/sysroots/i686-linux-musl/lib/libc_musl.so b/sysroots/i686-linux-musl/lib/libc_musl.so
index 13b5b3ee..d0a495cf 100755
--- a/sysroots/i686-linux-musl/lib/libc_musl.so
+++ b/sysroots/i686-linux-musl/lib/libc_musl.so
diff --git a/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o b/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
index ea02e9c5..e6e61aee 100644
--- a/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
+++ b/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
diff --git a/sysroots/i686-linux-musl/lib/linker.script b/sysroots/i686-linux-musl/lib/linker.script
deleted file mode 100755
index aa07361b..00000000
--- a/sysroots/i686-linux-musl/lib/linker.script
+++ /dev/null
@@ -1,17 +0,0 @@
-ENTRY(__dlwrap__start)
-SECTIONS {
-  .linker_r 0x1000 : {
-    KEEP(*(.linker_r));
-  }
-  .linker_rx 0x4b3e0 : {
-    KEEP(*(.linker_rx));
-  }
-  .linker_rw 0x127e90 : {
-    KEEP(*(.linker_rw));
-  }
-  .linker_rw2 0x129358 : {
-    KEEP(*(.linker_rw2));
-  }
-  /DISCARD/ : { *(.interp) }
-}
-INSERT BEFORE .note.android.embedded_linker;
diff --git a/sysroots/i686-linux-musl/lib/rcrt1.o b/sysroots/i686-linux-musl/lib/rcrt1.o
index 1f342bba..2de1005a 100644
--- a/sysroots/i686-linux-musl/lib/rcrt1.o
+++ b/sysroots/i686-linux-musl/lib/rcrt1.o
diff --git a/sysroots/i686-linux-musl/lib/relinterp.script b/sysroots/i686-linux-musl/lib/relinterp.script
new file mode 100644
index 00000000..6b07e501
--- /dev/null
+++ b/sysroots/i686-linux-musl/lib/relinterp.script
@@ -0,0 +1,5 @@
+ENTRY(__ri__start)
+SECTIONS {
+  /DISCARD/ : { *(.interp) }
+}
+INSERT BEFORE .note.google.relinterp;
diff --git a/sysroots/x86_64-linux-musl/lib/Scrt1-real.o b/sysroots/x86_64-linux-musl/lib/Scrt1-real.o
index 920cd1c5..c9482277 100644
--- a/sysroots/x86_64-linux-musl/lib/Scrt1-real.o
+++ b/sysroots/x86_64-linux-musl/lib/Scrt1-real.o
diff --git a/sysroots/x86_64-linux-musl/lib/Scrt1.o b/sysroots/x86_64-linux-musl/lib/Scrt1.o
index 244e2907..1bc4e417 100644
--- a/sysroots/x86_64-linux-musl/lib/Scrt1.o
+++ b/sysroots/x86_64-linux-musl/lib/Scrt1.o
@@ -1,2 +1,2 @@
 GROUP ( Scrt1-real.o libc_musl_linker_object.o )
-INCLUDE linker.script
+INCLUDE relinterp.script
diff --git a/sysroots/x86_64-linux-musl/lib/crt1.o b/sysroots/x86_64-linux-musl/lib/crt1.o
index 2eb5fd84..a22b47f2 100644
--- a/sysroots/x86_64-linux-musl/lib/crt1.o
+++ b/sysroots/x86_64-linux-musl/lib/crt1.o
diff --git a/sysroots/x86_64-linux-musl/lib/libc.a b/sysroots/x86_64-linux-musl/lib/libc.a
index 53680a5e..7eb45bde 100644
--- a/sysroots/x86_64-linux-musl/lib/libc.a
+++ b/sysroots/x86_64-linux-musl/lib/libc.a
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl.so b/sysroots/x86_64-linux-musl/lib/libc_musl.so
index 2ebf854f..0f780b7b 100755
--- a/sysroots/x86_64-linux-musl/lib/libc_musl.so
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl.so
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
index 25ee1605..09b11c79 100644
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
diff --git a/sysroots/x86_64-linux-musl/lib/linker.script b/sysroots/x86_64-linux-musl/lib/linker.script
deleted file mode 100755
index 3e927bc1..00000000
--- a/sysroots/x86_64-linux-musl/lib/linker.script
+++ /dev/null
@@ -1,17 +0,0 @@
-ENTRY(__dlwrap__start)
-SECTIONS {
-  .linker_r 0x1000 : {
-    KEEP(*(.linker_r));
-  }
-  .linker_rx 0x501ac : {
-    KEEP(*(.linker_rx));
-  }
-  .linker_rw 0x11a180 : {
-    KEEP(*(.linker_rw));
-  }
-  .linker_rw2 0x11b8e0 : {
-    KEEP(*(.linker_rw2));
-  }
-  /DISCARD/ : { *(.interp) }
-}
-INSERT BEFORE .note.android.embedded_linker;
diff --git a/sysroots/x86_64-linux-musl/lib/rcrt1.o b/sysroots/x86_64-linux-musl/lib/rcrt1.o
index 988b730d..2711fbdc 100644
--- a/sysroots/x86_64-linux-musl/lib/rcrt1.o
+++ b/sysroots/x86_64-linux-musl/lib/rcrt1.o
diff --git a/sysroots/x86_64-linux-musl/lib/relinterp.script b/sysroots/x86_64-linux-musl/lib/relinterp.script
new file mode 100644
index 00000000..6b07e501
--- /dev/null
+++ b/sysroots/x86_64-linux-musl/lib/relinterp.script
@@ -0,0 +1,5 @@
+ENTRY(__ri__start)
+SECTIONS {
+  /DISCARD/ : { *(.interp) }
+}
+INSERT BEFORE .note.google.relinterp;