about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSterling Augustine <saugustine@google.com>2014-11-25 14:49:54 -0800
committerSterling Augustine <saugustine@google.com>2014-11-25 14:49:54 -0800
commit13e6e91707359ddd6a135d53b0e85af25c1f4cc8 (patch)
tree1df67509545ad032d9ea1309dc472799ba6004b8
parentcc586e77cf2333a78724830720a450705e0a7311 (diff)
downloadglibc-13e6e91707359ddd6a135d53b0e85af25c1f4cc8.tar.gz
glibc-13e6e91707359ddd6a135d53b0e85af25c1f4cc8.tar.xz
glibc-13e6e91707359ddd6a135d53b0e85af25c1f4cc8.zip
Use ENTRY and END macros to get a .size directive. backport of change:
-rw-r--r--README.google6
-rw-r--r--sysdeps/x86_64/start.S8
2 files changed, 8 insertions, 6 deletions
diff --git a/README.google b/README.google
index a68793375b..e1da8143e6 100644
--- a/README.google
+++ b/README.google
@@ -408,3 +408,9 @@ posix/wordexp-test.c
   flag when processing certain arithmetic inputs.
   (backport)
   https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=a39208bd7fb76c1b01c127b4c61f9bfd915bfe7c
+
+sysdeps/x86_64/start.S
+  For b/18331558, use ENTRY and END macros to get a .size directive.
+  (backport)
+  https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=467fec0bb47464ff49e7075194342b028c75c72f
+
diff --git a/sysdeps/x86_64/start.S b/sysdeps/x86_64/start.S
index e3d4ff8e20..97e972e680 100644
--- a/sysdeps/x86_64/start.S
+++ b/sysdeps/x86_64/start.S
@@ -55,11 +55,7 @@
 
 #include <sysdep.h>
 
-	.text
-	.globl _start
-	.type _start,@function
-_start:
-	cfi_startproc
+ENTRY (_start)
 	/* Clearing frame pointer is insufficient, use CFI.  */
 	cfi_undefined (rip)
 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
@@ -123,7 +119,7 @@ _start:
 #endif
 
 	hlt			/* Crash if somehow `exit' does return.	 */
-	cfi_endproc
+END (_start)
 
 /* Define a symbol for the first piece of initialized data.  */
 	.data