mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
5e5b3b8866
Building glibc with gcc configured with --enable-default-pie failed on s390 due to assembler messages: ../sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S:44: Error: junk at end of line, first unrecognized character is `@' HIDDEN_JUMPTARGET was expanded to exit@PLT@GOTOFF. If SHARED is not defined, HIDDEN_JUMPTARGET is defined to JUMPTARGET in sysdeps/s390/s390-32/sysdep.h. There it expanded to exit@PLT in non SHARED case as PIC is defined if gcc is configured with --enable-default-pie. Thus I've changed the "ifdef PIC" to "ifdef SHARED" as we do not want PLTs in the static obj files. I've also changed this in sysdeps/s390/s390-64/sysdep.h. I've also adjusted sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S. If glibc is configured with --disable-hidden-plt, then NO_HIDDEN is defined. In SHARED case HIDDEN_JUMPTARGET would be expanded to exit@PLT@GOTOFF instead of __GI_exit@GOTOFF. Now we jump to: - __GI_exit if SHARED is defined - exit@PLT if SHARED and NO_HIDDEN is defined - exit if both are not defined. On s390 31bit we have to setup GOT pointer in r12 if we use a PLT stub. Therefore I use SYSCALL_PIC_SETUP from sysdep.h and added the missing semicolons. ChangeLog: [BZ #21537] * sysdeps/s390/s390-32/sysdep.h (JUMPTARGET, SYSCALL_PIC_SETUP): Check SHARED instead of PIC. (SYSCALL_PIC_SETUP): Add missing semicolons. * sysdeps/s390/s390-64/sysdep.h (JUMPTARGET, SYSCALL_PIC_SETUP): Check SHARED instead of PIC. * sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S (__makecontext_ret): Adjust code to jump to exit.
102 lines
3.1 KiB
C
102 lines
3.1 KiB
C
/* Assembler macros for s390.
|
|
Copyright (C) 2000-2017 Free Software Foundation, Inc.
|
|
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sysdeps/generic/sysdep.h>
|
|
|
|
#ifdef __ASSEMBLER__
|
|
|
|
/* Syntactic details of assembler. */
|
|
|
|
/* ELF uses byte-counts for .align, most others use log2 of count of bytes. */
|
|
#define ALIGNARG(log2) 1<<log2
|
|
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
|
|
|
|
|
|
/* Define an entry point visible from C. */
|
|
#define ENTRY(name) \
|
|
.globl C_SYMBOL_NAME(name); \
|
|
.type C_SYMBOL_NAME(name),@function; \
|
|
.align ALIGNARG(2); \
|
|
C_LABEL(name) \
|
|
cfi_startproc; \
|
|
CALL_MCOUNT
|
|
|
|
#undef END
|
|
#define END(name) \
|
|
cfi_endproc; \
|
|
ASM_SIZE_DIRECTIVE(name) \
|
|
|
|
/* If compiled for profiling, call `mcount' at the start of each function. */
|
|
#ifdef PROF
|
|
#ifdef PIC
|
|
#define CALL_MCOUNT \
|
|
lr 0,14 ; bras 14,.+12 ; .long _GLOBAL_OFFSET_TABLE_ - . ; .long 0f-. ; \
|
|
lr 1,14 ; al 1,4(14) ; al 14,0(14) ; l 14,_mcount@GOT(14) ; \
|
|
basr 14,14 ; lr 14,0 ; .data ; .align 4 ; 0: .long 0 ; .text ;
|
|
#else
|
|
#define CALL_MCOUNT \
|
|
lr 0,14 ; bras 14,.+12 ; .long _mcount ; .long 0f ; \
|
|
l 1,4(14) ; l 14,0(14) ; basr 14,14 ; lr 14,0 ; \
|
|
.data ; .align 4 ; 0: .long 0 ; .text ;
|
|
#endif
|
|
#else
|
|
#define CALL_MCOUNT /* Do nothing. */
|
|
#endif
|
|
|
|
/* Since C identifiers are not normally prefixed with an underscore
|
|
on this system, the asm identifier `syscall_error' intrudes on the
|
|
C name space. Make sure we use an innocuous name. */
|
|
#define syscall_error __syscall_error
|
|
#define mcount _mcount
|
|
|
|
#undef PSEUDO
|
|
#define PSEUDO(name, syscall_name, args) \
|
|
lose: SYSCALL_PIC_SETUP \
|
|
basr %r1,0; \
|
|
0: al %r1,1f-0b(%r1); \
|
|
br %r1; \
|
|
1: .long JUMPTARGET(syscall_error) - 0b; \
|
|
.globl syscall_error; \
|
|
ENTRY (name) \
|
|
DO_CALL (syscall_name, args); \
|
|
jm lose
|
|
|
|
#undef PSEUDO_END
|
|
#define PSEUDO_END(name) \
|
|
END (name)
|
|
|
|
#undef JUMPTARGET
|
|
#ifdef SHARED
|
|
#define JUMPTARGET(name) name##@PLT
|
|
#define SYSCALL_PIC_SETUP \
|
|
bras %r12,1f; \
|
|
0: .long _GLOBAL_OFFSET_TABLE_-0b; \
|
|
1: al %r12,0(%r12)
|
|
#else
|
|
#define JUMPTARGET(name) name
|
|
#define SYSCALL_PIC_SETUP /* Nothing. */
|
|
#endif
|
|
|
|
/* Local label name for asm code. */
|
|
#ifndef L
|
|
#define L(name) .L##name
|
|
#endif
|
|
|
|
#endif /* __ASSEMBLER__ */
|