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

Commit 9e795d18 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

DO NOT MERGE - x86: Switch get_pc_thunk to comdat am: 82a08414 

Change-Id: I104cc2cbb35746dfbebec98494f0c99748bbed8b
parents 4fc7373f 82a08414

libcutils/arch-x86/android_memset16.S

+3 −1
Original line number Diff line number Diff line
@@ -105,14 +105,16 @@ name: \ 
    /* We loaded the jump table and adjuested EDX. Go.  */	\

    jmp		*%ebx



	.section	.gnu.linkonce.t.__x86.get_pc_thunk.bx,"ax",@progbits

	.section	.text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat

	.globl	__x86.get_pc_thunk.bx

	.hidden	__x86.get_pc_thunk.bx

	ALIGN (4)

	.type	__x86.get_pc_thunk.bx,@function

__x86.get_pc_thunk.bx:

	cfi_startproc

	movl	(%esp), %ebx

	ret

	cfi_endproc

#else

# define ENTRANCE

# define RETURN_END	ret

libcutils/arch-x86/android_memset32.S

+3 −1
Original line number Diff line number Diff line
@@ -105,14 +105,16 @@ name: \ 
    /* We loaded the jump table and adjuested EDX. Go.  */	\

    jmp		*%ebx



	.section	.gnu.linkonce.t.__x86.get_pc_thunk.bx,"ax",@progbits

	.section	.text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat

	.globl	__x86.get_pc_thunk.bx

	.hidden	__x86.get_pc_thunk.bx

	ALIGN (4)

	.type	__x86.get_pc_thunk.bx,@function

__x86.get_pc_thunk.bx:

	cfi_startproc

	movl	(%esp), %ebx

	ret

	cfi_endproc

#else

# define ENTRANCE

# define RETURN_END	ret