From 7bbf973451f7e74bcdc93475aa57dff0010a4e42 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 23 Jan 2015 20:46:43 +0100 Subject: [PATCH] elf-lib.h: New file. libgcc/ChangeLog: * config/i386/elf-lib.h: New file. (CRT_GET_RFIB_DATA): Move definition from gcc/config/i386/gnu-user.h. Wrap definition in #ifdef __i386__. * libgcc/config.host (i[34567]86-*-linux*, i[34567]86-*-kfreebsd*-gnu) (i[34567]86-*-knetbsd*-gnu, i[34567]86-*-gnu*) (i[34567]86-*-kopensolaris*-gnu, x86_64-*-linux*) (x86_64-*-kfreebsd*-gnu, x86_64-*-knetbsd*-gnu): Add i386/elf-lib.h to tm_file. gcc/ChangeLog: * config/i386/gnu-user.h (CRT_GET_RFIB_DATA): Move definition to libgcc/config/i386/elf-lib.h. From-SVN: r220056 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/gnu-user.h | 13 ------------- libgcc/ChangeLog | 11 +++++++++++ libgcc/config.host | 4 ++++ libgcc/config/i386/elf-lib.h | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 libgcc/config/i386/elf-lib.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 75f321b2504..12f1300c316 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-23-01 Uros Bizjak + + * config/i386/gnu-user.h (CRT_GET_RFIB_DATA): Move definition to + libgcc/config/i386/elf-lib.h. + 2015-01-23 Jakub Jelinek PR driver/64737 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h index 751608bfe41..0d001e22f9e 100644 --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h @@ -129,19 +129,6 @@ along with GCC; see the file COPYING3. If not see } \ } while (0) -/* Used by crtstuff.c to initialize the base of data-relative relocations. - These are GOT relative on x86, so return the pic register. */ -#define CRT_GET_RFIB_DATA(BASE) \ - __asm__ ("call\t.LPR%=\n" \ - ".LPR%=:\n\t" \ - "pop{l}\t%0\n\t" \ - /* Due to a GAS bug, this cannot use EAX. That encodes \ - smaller than the traditional EBX, which results in the \ - offset being off by one. */ \ - "add{l}\t{$_GLOBAL_OFFSET_TABLE_+[.-.LPR%=],%0" \ - "|%0,_GLOBAL_OFFSET_TABLE_+(.-.LPR%=)}" \ - : "=d"(BASE)) - #ifdef TARGET_LIBC_PROVIDES_SSP /* i386 glibc provides __stack_chk_guard in %gs:0x14. */ #define TARGET_THREAD_SSP_OFFSET 0x14 diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 10e28494648..a3e38930cf8 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,14 @@ +2015-01-23 Uros Bizjak + + * config/i386/elf-lib.h: New file. + (CRT_GET_RFIB_DATA): Move definition from gcc/config/i386/gnu-user.h. + Wrap definition in #ifdef __i386__. + * libgcc/config.host (i[34567]86-*-linux*, i[34567]86-*-kfreebsd*-gnu) + (i[34567]86-*-knetbsd*-gnu, i[34567]86-*-gnu*) + (i[34567]86-*-kopensolaris*-gnu, x86_64-*-linux*) + (x86_64-*-kfreebsd*-gnu, x86_64-*-knetbsd*-gnu): Add i386/elf-lib.h + to tm_file. + 2015-01-22 Chen Gang * unwind-dw2-fde.h (last_fde): Use "(const fde *)" instead of diff --git a/libgcc/config.host b/libgcc/config.host index 3065c8a06db..92ac88eea7b 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -585,20 +585,24 @@ x86_64-*-openbsd*) i[34567]86-*-linux*) extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules" + tm_file="${tm_file} i386/elf-lib.h" md_unwind_header=i386/linux-unwind.h ;; i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu) extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules" + tm_file="${tm_file} i386/elf-lib.h" ;; x86_64-*-linux*) extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules" + tm_file="${tm_file} i386/elf-lib.h" md_unwind_header=i386/linux-unwind.h ;; x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules" + tm_file="${tm_file} i386/elf-lib.h" ;; i[34567]86-pc-msdosdjgpp*) ;; diff --git a/libgcc/config/i386/elf-lib.h b/libgcc/config/i386/elf-lib.h new file mode 100644 index 00000000000..94fc48682bf --- /dev/null +++ b/libgcc/config/i386/elf-lib.h @@ -0,0 +1,36 @@ +/* Definitions for Intel 386 systems using GNU userspace. + Copyright (C) 2015 Free Software Foundation, Inc. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC 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 General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifdef __i386__ +/* Used by crtstuff.c to initialize the base of data-relative relocations. + These are GOT relative on x86, so return the pic register. */ +#define CRT_GET_RFIB_DATA(BASE) \ + __asm__ ("call\t.LPR%=\n" \ + ".LPR%=:\n\t" \ + "pop{l}\t%0\n\t" \ + /* Due to a GAS bug, this cannot use EAX. That encodes \ + smaller than the traditional EBX, which results in the \ + offset being off by one. */ \ + "add{l}\t{$_GLOBAL_OFFSET_TABLE_+[.-.LPR%=],%0" \ + "|%0,_GLOBAL_OFFSET_TABLE_+(.-.LPR%=)}" \ + : "=d"(BASE)) +#endif -- 2.30.2