diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
| commit | 40d5df28bc4278d543697c960267ba3b5da74163 (patch) | |
| tree | 4a1cae5501cb263d8b2fbd821ff0434bc7732809 /libc/arch-x86/string/strncmp_wrapper.S | |
| parent | 6ed844f1f2e3a53939b606011a76fb3e353a7a92 (diff) | |
| parent | 50a83255d80f98b857c3f72dd2225d4bbc720ca3 (diff) | |
| download | android_bionic-gingerbread-release.tar.gz android_bionic-gingerbread-release.tar.bz2 android_bionic-gingerbread-release.zip | |
Merge branch 'gingerbread' of git://git.omapzoom.org/platform/bionic into 237cm-7.1.0gingerbread-release
Conflicts:
libc/Android.mk
libthread_db/Android.mk
Change-Id: I4a730f70bf3b31331ab9cee5f1a098d4162ef4b7
Diffstat (limited to 'libc/arch-x86/string/strncmp_wrapper.S')
| -rw-r--r-- | libc/arch-x86/string/strncmp_wrapper.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/arch-x86/string/strncmp_wrapper.S b/libc/arch-x86/string/strncmp_wrapper.S index 205018420..191d7555e 100644 --- a/libc/arch-x86/string/strncmp_wrapper.S +++ b/libc/arch-x86/string/strncmp_wrapper.S @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # define USE_AS_STRNCMP # define ssse3_strcmp_latest strncmp -# include "ssse3-strcmp.S" +# include "ssse3-strcmp-latest.S" #else |