From b677236af0dc857c3f03ed724e77b4961e4c0b9c Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Tue, 9 Sep 2014 15:53:01 +0000 Subject: [PATCH] Add crtfastmath for AArch64. gcc/Changelog 2014-09-09 Marcus Shawcroft Ramana Radhakrishnan * config/aarch64/aarch64-elf-raw.h (ENDFILE_SPEC): Add crtfastmath.o. * config/aarch64/aarch64-linux.h (GNU_USER_TARGET_MATH_ENDFILE_SPEC): Define. (ENDFILE_SPEC): Define and use GNU_USER_TARGET_MATH_ENDFILE_SPEC. libgcc/Changelog 2014-09-09 Marcus Shawcroft Ramana Radhakrishnan * config.host (aarch64*): Include crtfastmath and t-crtfm. * config/aarch64/crtfastmath.c: New file. Co-Authored-By: Ramana Radhakrishnan From-SVN: r215086 --- gcc/ChangeLog | 8 +++++++ gcc/config/aarch64/aarch64-elf-raw.h | 4 +++- gcc/config/aarch64/aarch64-linux.h | 8 +++++++ libgcc/ChangeLog | 7 ++++++ libgcc/config.host | 6 +++-- libgcc/config/aarch64/crtfastmath.c | 36 ++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 libgcc/config/aarch64/crtfastmath.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 79c9df7abdb..a447daf1f89 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-09-09 Marcus Shawcroft + Ramana Radhakrishnan + + * config/aarch64/aarch64-elf-raw.h (ENDFILE_SPEC): Add crtfastmath.o. + * config/aarch64/aarch64-linux.h (GNU_USER_TARGET_MATH_ENDFILE_SPEC): + Define. + (ENDFILE_SPEC): Define and use GNU_USER_TARGET_MATH_ENDFILE_SPEC. + 2014-09-09 David Malcolm * rtl.h (INSN_LOCATION): Strengthen param from const_rtx to diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h index adec7e7bad8..b9d4e8db8f0 100644 --- a/gcc/config/aarch64/aarch64-elf-raw.h +++ b/gcc/config/aarch64/aarch64-elf-raw.h @@ -23,7 +23,9 @@ #define GCC_AARCH64_ELF_RAW_H #define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s" -#define ENDFILE_SPEC " crtend%O%s crtn%O%s" +#define ENDFILE_SPEC \ + " crtend%O%s crtn%O%s " \ + "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s}" #ifndef LINK_SPEC #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X \ diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h index 8d203101d36..1731432a4d1 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -37,6 +37,14 @@ #define LINK_SPEC LINUX_TARGET_LINK_SPEC +#define GNU_USER_TARGET_MATHFILE_SPEC \ + "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s}" + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC \ + GNU_USER_TARGET_MATHFILE_SPEC " " \ + GNU_USER_TARGET_ENDFILE_SPEC + #define TARGET_OS_CPP_BUILTINS() \ do \ { \ diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 531bdcaa238..317dc29b985 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2014-09-09 Marcus Shawcroft + Ramana Radhakrishnan + + * config.host (aarch64*): Include crtfastmath.o and + t-crtfm. + * config/aarch64/crtfastmath.c: New file. + 2014-09-08 Trevor Saunders * config.host: Remove picochip support. diff --git a/libgcc/config.host b/libgcc/config.host index 6ea18874132..2f6569bf8fb 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -322,13 +322,15 @@ esac case ${host} in aarch64*-*-elf) extra_parts="$extra_parts crtbegin.o crtend.o crti.o crtn.o" + extra_parts="$extra_parts crtfastmath.o" tmake_file="${tmake_file} ${cpu_type}/t-aarch64" - tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp" + tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" ;; aarch64*-*-linux*) + extra_parts="$extra_parts crtfastmath.o" md_unwind_header=aarch64/linux-unwind.h tmake_file="${tmake_file} ${cpu_type}/t-aarch64" - tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp" + tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" ;; alpha*-*-linux*) tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee t-crtfm alpha/t-linux" diff --git a/libgcc/config/aarch64/crtfastmath.c b/libgcc/config/aarch64/crtfastmath.c new file mode 100644 index 00000000000..3a8ddfca89d --- /dev/null +++ b/libgcc/config/aarch64/crtfastmath.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2014 Free Software Foundation, Inc. + * + * This file 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. + * + * This file 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 + * . + */ + +#define _FPU_FPCR_FZ 0x1000000 + +#define _FPU_SETCW(fpcr) \ + { \ + __asm__ __volatile__ ("msr fpcr, %0" : : "r" (fpcr)); \ + } + +static void __attribute__((constructor)) +set_fast_math (void) +{ + /* Flush to zero, round to nearest, IEEE exceptions disabled. */ + _FPU_SETCW (_FPU_FPCR_FZ); +} -- 2.30.2