Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d87e743 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Eliminate text relocations in x86 optimized memset versions"

parents f1296b9e 9ff8767b

libcutils/arch-x86/sse2-memset16-atom.S

100644 → 100755
+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ name: \ 
# define SETRTNVAL	movl DEST(%esp), %eax

#endif



#ifdef SHARED

#if (defined SHARED || defined __PIC__)

# define ENTRANCE	PUSH (%ebx);

# define RETURN_END	POP (%ebx); ret

# define RETURN		RETURN_END; CFI_PUSH (%ebx)
@@ -344,7 +344,7 @@ L(128bytesormore): 
	PUSH (%ebx)

	mov	$SHARED_CACHE_SIZE, %ebx

#else

# ifdef SHARED

# if (defined SHARED || defined __PIC__)

	call	__i686.get_pc_thunk.bx

	add	$_GLOBAL_OFFSET_TABLE_, %ebx

	mov	__x86_shared_cache_size@GOTOFF(%ebx), %ebx
@@ -362,7 +362,7 @@ L(128bytesormore): 
# define RESTORE_EBX_STATE CFI_PUSH (%ebx)

	cmp	$DATA_CACHE_SIZE, %ecx

#else

# ifdef SHARED

# if (defined SHARED || defined __PIC__)

#  define RESTORE_EBX_STATE

	call	__i686.get_pc_thunk.bx

	add	$_GLOBAL_OFFSET_TABLE_, %ebx
@@ -471,7 +471,7 @@ L(128bytesormore_nt): 
	jae	L(128bytesormore_nt)

	sfence

L(shared_cache_loop_end):

#if defined DATA_CACHE_SIZE || !defined SHARED

#if defined DATA_CACHE_SIZE || !(defined SHARED || defined __PIC__)

	POP (%ebx)

#endif

	add	%ecx, %edx

libcutils/arch-x86/sse2-memset32-atom.S

100644 → 100755
+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ name: \ 
# define SETRTNVAL

#endif



#ifdef SHARED

#if (defined SHARED || defined __PIC__)

# define ENTRANCE	PUSH (%ebx);

# define RETURN_END	POP (%ebx); ret

# define RETURN		RETURN_END; CFI_PUSH (%ebx)
@@ -259,7 +259,7 @@ L(128bytesormore): 
	PUSH (%ebx)

	mov	$SHARED_CACHE_SIZE, %ebx

#else

# ifdef SHARED

# if (defined SHARED || defined __PIC__)

	call	__i686.get_pc_thunk.bx

	add	$_GLOBAL_OFFSET_TABLE_, %ebx

	mov	__x86_shared_cache_size@GOTOFF(%ebx), %ebx
@@ -276,7 +276,7 @@ L(128bytesormore): 
# define RESTORE_EBX_STATE CFI_PUSH (%ebx)

	cmp	$DATA_CACHE_SIZE, %ecx

#else

# ifdef SHARED

# if (defined SHARED || defined __PIC__)

#  define RESTORE_EBX_STATE

	call	__i686.get_pc_thunk.bx

	add	$_GLOBAL_OFFSET_TABLE_, %ebx
@@ -386,7 +386,7 @@ L(128bytesormore_nt): 
	jae	L(128bytesormore_nt)

	sfence

L(shared_cache_loop_end):

#if defined DATA_CACHE_SIZE || !defined SHARED

#if defined DATA_CACHE_SIZE || !(defined SHARED || defined __PIC__)

	POP (%ebx)

#endif

	add	%ecx, %edx