From cc86234f0fd7cb444885652683d9ee1a5100b396 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 28 Apr 2015 11:23:40 +0200 Subject: [PATCH] elf-lib.h: New file. libgcc/ChangeLog: * config/frv/elf-lib.h: New file. (CRT_GET_RFIB_DATA): Move definition from gcc/config/frv/frv.h. * libgcc/config.host (frv-*elf, frv-*-*linux*): Add frv/elf-lib.h to tm_file. * config/frv/frvbengin.c: Do not include defaults.h * config/frv/frvend.c: Ditto. gcc/ChangeLog: * config/frv/frv.h (CRT_GET_RFIB_DATA): Move definition to libgcc/config/frv/elf-lib.h. From-SVN: r222519 --- gcc/ChangeLog | 5 +++++ gcc/config/frv/frv.h | 5 ----- libgcc/ChangeLog | 20 ++++++++++++++++---- libgcc/config.host | 4 ++-- libgcc/config/frv/elf-lib.h | 26 ++++++++++++++++++++++++++ libgcc/config/frv/frvbegin.c | 1 - libgcc/config/frv/frvend.c | 1 - 7 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 libgcc/config/frv/elf-lib.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3f2a147607..9ba3a8382b0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-04-28 Uros Bizjak + + * config/frv/frv.h (CRT_GET_RFIB_DATA): Move definition to + libgcc/config/frv/elf-lib.h. + 2015-04-28 Tom de Vries * tree-call-cdce.c: Fix example in header comment. diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h index 394572c1423..978fefa2657 100644 --- a/gcc/config/frv/frv.h +++ b/gcc/config/frv/frv.h @@ -2125,9 +2125,4 @@ enum frv_builtins #define CPU_UNITS_QUERY 1 -#ifdef __FRV_FDPIC__ -#define CRT_GET_RFIB_DATA(dbase) \ - ({ extern void *_GLOBAL_OFFSET_TABLE_; (dbase) = &_GLOBAL_OFFSET_TABLE_; }) -#endif - #endif /* __FRV_H__ */ diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c48a61cbe37..b18c7aed9b8 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,15 @@ +2015-04-28 Uros Bizjak + + * config/frv/elf-lib.h: New file. + (CRT_GET_RFIB_DATA): Move definition from gcc/config/frv/frv.h. + * libgcc/config.host (frv-*elf, frv-*-*linux*): Add frv/elf-lib.h + to tm_file. + +2015-04-28 Uros Bizjak + + * config/frv/frvbengin.c: Do not include defaults.h + * config/frv/frvend.c: Ditto. + 2015-04-27 Yoshinori Sato * config.host: Add h8300-*-linux @@ -296,7 +308,7 @@ (SUBWORD_BOOL_CAS): Likewise. (FETCH_AND_OP_WORD): Update. Consistently use signed types. - + 2014-11-13 Bernd Schmidt Thomas Schwinge Ilya Verbin @@ -964,7 +976,7 @@ (__gcov_delta_counter_op): Process delta profile counter values. (__gcov_single_counter_op): Process single profile counter values. (fp_scale): Callback function for float-point scaling. - (int_scale): Callback function for integer fraction scaling. + (int_scale): Callback function for integer fraction scaling. (gcov_profile_scale): Scaling profile counters. (gcov_profile_normalize): Normalize profile counters. * libgcov.h: Add headers and functions for gcov-tool use. @@ -1393,7 +1405,7 @@ (gcov_exit_merge_summary): Ditto. (gcov_exit_dump_gcov): Ditto. -2014-01-08 Rong Xu +2014-01-08 Rong Xu * libgcov-driver.c: Use libgcov.h. (buffer_fn_data): Use xmalloc instead of malloc. @@ -2283,7 +2295,7 @@ * config/mips/crtn.S (fini, init): New labels. 2012-02-19 Edgar E. Iglesias - * config/microblaze/modsi3.S (modsi3): Fix case with 0x80000000 + * config/microblaze/modsi3.S (modsi3): Fix case with 0x80000000 as dividend. 2013-02-16 Alan Modra diff --git a/libgcc/config.host b/libgcc/config.host index 570998feffa..ac39f422059 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -469,13 +469,13 @@ fr30-*-elf) ;; frv-*-elf) tmake_file="$tmake_file frv/t-frv t-fdpbit" - tm_file="$tm_file frv/frv-abi.h" + tm_file="$tm_file frv/elf-lib.h frv/frv-abi.h" # Don't use crtbegin.o, crtend.o. extra_parts="frvbegin.o frvend.o" ;; frv-*-*linux*) tmake_file="$tmake_file frv/t-frv frv/t-linux t-fdpbit" - tm_file="$tm_file frv/frv-abi.h" + tm_file="$tm_file frv/elf-lib.h frv/frv-abi.h" ;; h8300-*-rtems*) tmake_file="$tmake_file h8300/t-h8300 t-fpbit" diff --git a/libgcc/config/frv/elf-lib.h b/libgcc/config/frv/elf-lib.h new file mode 100644 index 00000000000..7ac3b4da2ce --- /dev/null +++ b/libgcc/config/frv/elf-lib.h @@ -0,0 +1,26 @@ +/* Target macros for the FRV port of GCC. + 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 __FRV_FDPIC__ +#define CRT_GET_RFIB_DATA(dbase) \ + ({ extern void *_GLOBAL_OFFSET_TABLE_; (dbase) = &_GLOBAL_OFFSET_TABLE_; }) +#endif diff --git a/libgcc/config/frv/frvbegin.c b/libgcc/config/frv/frvbegin.c index 3adf4d9d004..17f77ae2a8e 100644 --- a/libgcc/config/frv/frvbegin.c +++ b/libgcc/config/frv/frvbegin.c @@ -26,7 +26,6 @@ This file was originally taken from the file crtstuff.c in the main compiler directory, and simplified. */ -#include "defaults.h" #include #include "../libgcc/unwind-dw2-fde.h" #include "gbl-ctors.h" diff --git a/libgcc/config/frv/frvend.c b/libgcc/config/frv/frvend.c index d80139f5533..850effe8caa 100644 --- a/libgcc/config/frv/frvend.c +++ b/libgcc/config/frv/frvend.c @@ -23,7 +23,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ -#include "defaults.h" #include #include "../libgcc/unwind-dw2-fde.h" -- 2.30.2