commit b69a0d496930b1faf2559ce268064bc1a005215e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 19 19:27:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 19 19:27:48 2021 +0000
tree ebf0e0323022577a89612caf9ac210892d6785c7
parent 35e81bfc9fd55347e949870b575ffdd5cadb8476
parent 7b89be78f44dc1be48697f2c055fbf3a9534f856

Merge "Move __libc_int0x80 to an assembly file"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 9427960..2db2edf 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -170,6 +170,7 @@
         x86: {
             srcs: [
                 "arch-x86/bionic/__libc_init_sysinfo.cpp",
+                "arch-x86/bionic/__libc_int0x80.S",
                 "arch-x86/bionic/__set_tls.cpp",
             ],
         },

libc/arch-x86/bionic/__libc_init_sysinfo.cpp

diff --git a/libc/arch-x86/bionic/__libc_init_sysinfo.cpp b/libc/arch-x86/bionic/__libc_init_sysinfo.cpp
index db931d1..de099b8 100644
--- a/libc/arch-x86/bionic/__libc_init_sysinfo.cpp
+++ b/libc/arch-x86/bionic/__libc_init_sysinfo.cpp
@@ -32,10 +32,6 @@
 // This file is compiled without stack protection, because it runs before TLS
 // has been set up.
 
-__LIBC_HIDDEN__ __attribute__((__naked__)) void __libc_int0x80() {
-  __asm__ volatile("int $0x80; ret");
-}
-
 __LIBC_HIDDEN__ void __libc_init_sysinfo() {
   bool unused;
   __libc_sysinfo = reinterpret_cast<void*>(__bionic_getauxval(AT_SYSINFO, &unused));

libc/arch-x86/bionic/__libc_int0x80.S

diff --git a/libc/arch-x86/bionic/__libc_int0x80.S b/libc/arch-x86/bionic/__libc_int0x80.S
new file mode 100644
index 0000000..66f0a1a
--- /dev/null
+++ b/libc/arch-x86/bionic/__libc_int0x80.S
@@ -0,0 +1,7 @@
+#include <private/bionic_asm.h>
+
+// void __libc_int0x80();
+ENTRY_PRIVATE(__libc_int0x80)
+  int $0x80
+  ret
+END(__libc_int0x80)

libc/private/bionic_globals.h

diff --git a/libc/private/bionic_globals.h b/libc/private/bionic_globals.h
index 8132261..16f89bf 100644
--- a/libc/private/bionic_globals.h
+++ b/libc/private/bionic_globals.h
@@ -123,7 +123,7 @@
 
 #if defined(__i386__)
 __LIBC_HIDDEN__ extern void* __libc_sysinfo;
-__LIBC_HIDDEN__ void __libc_int0x80();
+extern "C" __LIBC_HIDDEN__ void __libc_int0x80();
 __LIBC_HIDDEN__ void __libc_init_sysinfo();
 #endif