From 58ccb8ec7ce8745e19af3ce966234bcb9e207c9e Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Sun, 8 Dec 2019 12:12:50 -0500 Subject: [PATCH] Revert commit r279023. 2019-12-08 Sandra Loosemore Revert commit r279023. 2019-12-05 Sandra Loosemore gcc/ * config/nios2/linux.h (LINK_EH_SPEC): Define. gcc/testsuite/ * g++.target/nios2/hello-pie.C: New. * g++.target/nios2/nios2.exp: New. From-SVN: r279094 --- gcc/ChangeLog | 8 +++++ gcc/config/nios2/linux.h | 6 ---- gcc/testsuite/ChangeLog | 9 ++++++ gcc/testsuite/g++.target/nios2/hello-pie.C | 14 --------- gcc/testsuite/g++.target/nios2/nios2.exp | 34 ---------------------- 5 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 gcc/testsuite/g++.target/nios2/hello-pie.C delete mode 100644 gcc/testsuite/g++.target/nios2/nios2.exp diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5bb4a5b7ad2..e84fb302fd5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-12-08 Sandra Loosemore + + Revert: + + 2019-12-05 Sandra Loosemore + + * config/nios2/linux.h (LINK_EH_SPEC): Define. + 2019-12-07 Jan Hubicka * cgraph.c (cgraph_node::dump): Make tp_first_run 64bit. diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h index 9936b3101d9..698734add35 100644 --- a/gcc/config/nios2/linux.h +++ b/gcc/config/nios2/linux.h @@ -40,12 +40,6 @@ -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ %{static:-static}}" -/* The nios2 ABI does not have appropriate relocations to support - --eh-frame-hdr with PIE, or in shared libraries. */ -#undef LINK_EH_SPEC -#define LINK_EH_SPEC \ - "%{!pie: %{!shared: %{!static:--eh-frame-hdr}}} " - /* This toolchain implements the ABI for Linux Systems documented in the Nios II Processor Reference Handbook. */ #define TARGET_LINUX_ABI 1 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8e8e1e9b532..3516d8dac73 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2019-12-08 Sandra Loosemore + + Revert: + + 2019-12-05 Sandra Loosemore + + * g++.target/nios2/hello-pie.C: New. + * g++.target/nios2/nios2.exp: New. + 2018-12-08 Thomas Koenig PR fortran/92780 diff --git a/gcc/testsuite/g++.target/nios2/hello-pie.C b/gcc/testsuite/g++.target/nios2/hello-pie.C deleted file mode 100644 index ed016f3daca..00000000000 --- a/gcc/testsuite/g++.target/nios2/hello-pie.C +++ /dev/null @@ -1,14 +0,0 @@ -// { dg-do run { target *-*-linux* } } -// { dg-options "-pie -fpie" } -// { dg-output "Hello, pie World" } - -// This test used to give an "FDE encoding" error from the linker due to -// the ABI not having appropriate relocations for PIE. - -#include - -int -main () -{ - std::cout << "Hello, pie World" << std::endl; -} diff --git a/gcc/testsuite/g++.target/nios2/nios2.exp b/gcc/testsuite/g++.target/nios2/nios2.exp deleted file mode 100644 index a4ff7d04ac8..00000000000 --- a/gcc/testsuite/g++.target/nios2/nios2.exp +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2019 Free Software Foundation, Inc. - -# This program 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 of the License, or -# (at your option) any later version. -# -# This program 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. -# -# You should have received a copy of the GNU General Public License -# along with GCC; see the file COPYING3. If not see -# . - -# GCC testsuite that uses the `dg.exp' driver. - -# Exit immediately if this isn't a nios2 target. -if ![istarget nios2*-*-*] then { - return -} - -# Load support procs. -load_lib g++-dg.exp - -# Initialize `dg'. -dg-init - -# Main loop. -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" "" - -# All done. -dg-finish -- 2.30.2