From 48882a1abe30ccfc262866c9afcf9e62fc400ae4 Mon Sep 17 00:00:00 2001 From: Liubov Dmitrieva Date: Wed, 7 Sep 2011 22:28:44 -0400 Subject: Fix up x86-32 section names for Atom code --- ChangeLog | 11 +++++++++++ sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S | 2 +- sysdeps/i386/i686/multiarch/strchr-sse2.S | 2 +- sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S | 3 +-- sysdeps/i386/i686/multiarch/strlen-sse2.S | 4 +--- sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S | 2 +- sysdeps/i386/i686/multiarch/strrchr-sse2.S | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad81f74..8062781 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-09-07 Ulrich Drepper + + * sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S: Fix mixup in section + names. + * sysdeps/i386/i686/multiarch/strchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/strlen-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/strrchr-sse2.S: Likewise. + Patch by Liubov Dmitrieva . + 2011-08-01 Adhemerval Zanella * sysdeps/powerpc/fpu/e_hypot.c: New file. diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S index 4797bc3..5a19ba2 100644 --- a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S @@ -40,7 +40,7 @@ # define STR1 PARMS # define STR2 STR1+4 - atom_text_section + .text ENTRY (__strchr_sse2_bsf) ENTRANCE diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2.S b/sysdeps/i386/i686/multiarch/strchr-sse2.S index a73b21e..9cc5ae8 100644 --- a/sysdeps/i386/i686/multiarch/strchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/strchr-sse2.S @@ -40,7 +40,7 @@ # define STR1 PARMS # define STR2 STR1+4 - .text + atom_text_section ENTRY (__strchr_sse2) ENTRANCE diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S index 715fa6b..ce50e0a 100644 --- a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S @@ -21,7 +21,6 @@ #if defined SHARED && !defined NOT_IN_libc #include -#include "asm-syntax.h" #define CFI_PUSH(REG) \ cfi_adjust_cfa_offset (4); \ @@ -39,7 +38,7 @@ #define RETURN POP (%edi); POP (%esi); ret; \ cfi_restore_state; cfi_remember_state - atom_text_section + .text ENTRY ( __strlen_sse2_bsf) ENTRANCE mov STR(%esp), %edi diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2.S b/sysdeps/i386/i686/multiarch/strlen-sse2.S index ca549ba..2dbc4a9 100644 --- a/sysdeps/i386/i686/multiarch/strlen-sse2.S +++ b/sysdeps/i386/i686/multiarch/strlen-sse2.S @@ -22,8 +22,6 @@ # ifndef USE_AS_STRCAT # include -# include "asm-syntax.h" - # define CFI_PUSH(REG) \ cfi_adjust_cfa_offset (4); \ cfi_rel_offset (REG, 0) @@ -39,7 +37,7 @@ # define ENTRANCE # define RETURN ret - .text + atom_text_section ENTRY (__strlen_sse2) ENTRANCE mov STR(%esp), %edx diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S index 8ec524d..f40dfdc 100644 --- a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S @@ -37,7 +37,7 @@ # define STR1 PARMS # define STR2 STR1+4 - atom_text_section + .text ENTRY (__strrchr_sse2_bsf) mov STR1(%esp), %ecx diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2.S b/sysdeps/i386/i686/multiarch/strrchr-sse2.S index 71cc69d..f46b17f 100644 --- a/sysdeps/i386/i686/multiarch/strrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/strrchr-sse2.S @@ -40,7 +40,7 @@ # define STR1 PARMS # define STR2 STR1+4 - .text + atom_text_section ENTRY (__strrchr_sse2) ENTRANCE -- cgit v1.1