Move Atom-optimized code out of the way and together

diff --git a/ChangeLog b/ChangeLog
index e2fc2951a284bbff213e37fdd556f87702e35f85..6ca72bfc50d98aaed0da3dd45afcfbfc25f6adfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-09-06  Ulrich Drepper  <drepper@gmail.com>
 
+       * sysdeps/i386/sysdep.h: Define atom_text_section.
+       * sysdeps/x86_64/sysdep.h: Likewise.
+       * sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S: Place function in
+       section with atom_text_section.
+       * sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: Likewise.
+       * sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S: Likewise.
+       * sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S: Likewise.
+       * sysdeps/x86_64/multiarch/strlen-no-bsf.S: Likewise.
+       * sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S: Likewise.
+
        * sysdeps/unix/sysv/linux/x86_64/clock_gettime.c: New file.
        * sysdeps/unix/sysv/linux/clock_gettime.c (SYSCALL_GETTIME): Allow
        already be defined.  Change to take two parameters and don't assign

diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S
index 5a19ba26bc18ac102c781b45b1f7170e913fe7b0..4797bc3ba73160bd3857eca56791112b7c53c439 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
 
-       .text
+       atom_text_section
 ENTRY (__strchr_sse2_bsf)
 
        ENTRANCE

diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
index 0dc651f01738f9f61cc9452e239844dce6699c67..715fa6b6f00074f79dab70269e0955c2daba2466 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
@@ -1,5 +1,5 @@
 /* strlen with SSE2 and BSF
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -39,7 +39,7 @@
 #define RETURN         POP (%edi); POP (%esi); ret; \
                        cfi_restore_state; cfi_remember_state
 
-       .text
+       atom_text_section
 ENTRY ( __strlen_sse2_bsf)
        ENTRANCE
        mov     STR(%esp), %edi

diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S
index f40dfdc026fce7788d5246b4e8c502f8f0f7e818..8ec524d8952366c2b2411de7a4e5b498be0c1818 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
 
-       .text
+       atom_text_section
 ENTRY (__strrchr_sse2_bsf)
 
        mov     STR1(%esp), %ecx

diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index efdc82dde7442df84cad25e511c6833aae18ec6f..a8a9e571bf290821a452b498484435e3e6841929 100644 (file)
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for i386.
-   Copyright (C) 1991-93,95,96,98,2002,2003,2005,2006
+   Copyright (C) 1991-93,95,96,98,2002,2003,2005,2006,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -167,4 +167,6 @@ __i686.get_pc_thunk.reg:                                                  \
 #endif
 #endif
 
+#define atom_text_section .section ".text.atom", "ax"
+
 #endif /* __ASSEMBLER__ */

diff --git a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
index 9e9c916805db94f4fcba073734c1b9c03ae22c50..4c5a48cdae6e778fbec1486af567fcc6544d26ae 100644 (file)
--- a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
+++ b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
@@ -23,7 +23,7 @@
 # include <sysdep.h>
 # include "asm-syntax.h"
 
-       .text
+       atom_text_section
 ENTRY (__strchr_sse2_no_bsf)
        movd    %esi, %xmm1
        movq    %rdi, %rcx

diff --git a/sysdeps/x86_64/multiarch/strlen-no-bsf.S b/sysdeps/x86_64/multiarch/strlen-no-bsf.S
index c730e0a5b3998861ee4b615c52666febbdf5c435..a430e5fa0fcd787769de14d729a8b024da5a0922 100644 (file)
--- a/sysdeps/x86_64/multiarch/strlen-no-bsf.S
+++ b/sysdeps/x86_64/multiarch/strlen-no-bsf.S
@@ -26,7 +26,7 @@
 
 #  define RETURN ret
 
-       .section .text.sse2,"ax",@progbits
+       atom_text_section
 ENTRY (__strlen_no_bsf)
 # endif
        xor     %eax, %eax

diff --git a/sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S b/sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S
index bbc94c3e89bae02f403d4dd902bf492d704cdf08..f839ecfbdc0154cba2a5e0587b5e4aa5980a0dac 100644 (file)
--- a/sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S
+++ b/sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S
@@ -23,7 +23,7 @@
 # include <sysdep.h>
 # include "asm-syntax.h"
 
-       .text
+       atom_text_section
 ENTRY (__strrchr_sse2_no_bsf)
 
        movd    %rsi, %xmm1

diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index 1d35f8fd1ebf071513935e033f96dcbc54dffb6e..d61e126733243819d570c85e59b65d20d99f18d4 100644 (file)
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for x86-64.
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -114,4 +114,6 @@ lose:                                                                             \
 # endif
 #endif
 
+#define atom_text_section .section ".text.atom", "ax"
+
 #endif /* __ASSEMBLER__ */