Fix up x86-32 section names for Atom code

diff --git a/ChangeLog b/ChangeLog
index ad81f74..8062781 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-07  Ulrich Drepper  <drepper@gmail.com>
+
+       * 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 <liubov.dmitrieva@intel.com>.
+
 2011-08-01  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 <sysdep.h>
-#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 (file)
--- 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 <sysdep.h>
-#  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 (file)
--- 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 (file)
--- 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