i386: Remove strrchr assembler implementation (61d08a9e) · Commits · 戴 / test

The constraints in the inline assembler implementation of i386 strrchr() were incorrect and break the build with recent gcc 4.3. Since there are only very few callers of strrchr() and none of them are performance relevant just remove the assembler implementation and use the C fallback instead. [ tglx: arch/x86 adaptation ] Cc: rguenther@suse.de Signed-off-by:

Andi Kleen <ak@suse.de> Signed-off-by:

Ingo Molnar <mingo@elte.hu> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

arch/x86/lib/string_32.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -160,26 +160,6 @@ char strchr(const char s, int c)
		EXPORT_SYMBOL(strchr);
		#endif

		#ifdef __HAVE_ARCH_STRRCHR
		char strrchr(const char s, int c)
		{
		int d0, d1;
		char * res;
		asm volatile( "movb %%al,%%ah\n"
		"1:\tlodsb\n\t"
		"cmpb %%ah,%%al\n\t"
		"jne 2f\n\t"
		"leal -1(%%esi),%0\n"
		"2:\ttestb %%al,%%al\n\t"
		"jne 1b"
		:"=g" (res), "=&S" (d0), "=&a" (d1)
		:"0" (0),"1" (s),"2" (c)
		:"memory");
		return res;
		}
		EXPORT_SYMBOL(strrchr);
		#endif

		#ifdef __HAVE_ARCH_STRLEN
		size_t strlen(const char * s)
		{

include/asm-x86/string_32.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -26,9 +26,6 @@ extern int strncmp(const char cs, const char ct, size_t count);
		#define __HAVE_ARCH_STRCHR
		extern char strchr(const char s, int c);

		#define __HAVE_ARCH_STRRCHR
		extern char strrchr(const char s, int c);

		#define __HAVE_ARCH_STRLEN
		extern size_t strlen(const char *s);

Admin message