63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
|
From 04d7bd868b300c8150231d7a37e62150eaf810d0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Max Filippov <jcmvbkbc@gmail.com>
|
||
|
|
Date: Mon, 24 Mar 2014 01:06:35 +0400
|
||
|
|
Subject: [PATCH] xtensa: add missing .literal_position directives
|
||
|
|
|
||
|
|
This addition allows building uClibc with -mtext-section-literals
|
||
|
|
|
||
|
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||
|
|
---
|
||
|
|
ldso/ldso/xtensa/dl-startup.h | 1 +
|
||
|
|
ldso/ldso/xtensa/resolve.S | 1 +
|
||
|
|
libc/string/xtensa/strcmp.S | 5 +++--
|
||
|
|
3 files changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ldso/ldso/xtensa/dl-startup.h b/ldso/ldso/xtensa/dl-startup.h
|
||
|
|
index 45af82d..b135a4c 100644
|
||
|
|
--- a/ldso/ldso/xtensa/dl-startup.h
|
||
|
|
+++ b/ldso/ldso/xtensa/dl-startup.h
|
||
|
|
@@ -11,6 +11,7 @@
|
||
|
|
__asm__ (
|
||
|
|
" .text\n"
|
||
|
|
" .align 4\n"
|
||
|
|
+ " .literal_position\n"
|
||
|
|
" .global _start\n"
|
||
|
|
" .type _start, @function\n"
|
||
|
|
" .hidden _start\n"
|
||
|
|
diff --git a/ldso/ldso/xtensa/resolve.S b/ldso/ldso/xtensa/resolve.S
|
||
|
|
index 61c2c5d..d1ae8aa 100644
|
||
|
|
--- a/ldso/ldso/xtensa/resolve.S
|
||
|
|
+++ b/ldso/ldso/xtensa/resolve.S
|
||
|
|
@@ -27,6 +27,7 @@
|
||
|
|
|
||
|
|
.text
|
||
|
|
.align 4
|
||
|
|
+ .literal_position
|
||
|
|
.global _dl_linux_resolve
|
||
|
|
.type _dl_linux_resolve, @function
|
||
|
|
_dl_linux_resolve:
|
||
|
|
diff --git a/libc/string/xtensa/strcmp.S b/libc/string/xtensa/strcmp.S
|
||
|
|
index d3d72e0..8ed1ed0 100644
|
||
|
|
--- a/libc/string/xtensa/strcmp.S
|
||
|
|
+++ b/libc/string/xtensa/strcmp.S
|
||
|
|
@@ -34,13 +34,14 @@
|
||
|
|
|
||
|
|
#define MASK4 0x40404040
|
||
|
|
|
||
|
|
+ .text
|
||
|
|
+ .align 4
|
||
|
|
+ .literal_position
|
||
|
|
.literal .Lmask0, MASK0
|
||
|
|
.literal .Lmask1, MASK1
|
||
|
|
.literal .Lmask2, MASK2
|
||
|
|
.literal .Lmask3, MASK3
|
||
|
|
.literal .Lmask4, MASK4
|
||
|
|
-
|
||
|
|
- .text
|
||
|
|
ENTRY (strcmp)
|
||
|
|
/* a2 = s1, a3 = s2 */
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.1.4
|
||
|
|
|