From b460e64da56ecff8f1d178c1eade56397d3d71cf Mon Sep 17 00:00:00 2001 From: Krister Walfridsson Date: Tue, 26 Sep 2017 21:26:21 +0000 Subject: [PATCH] re PR target/39570 (cabs and cabsf are named differently on NetBSD 5) 2017-09-26 Krister Walfridsson PR target/39570 * gcc/config/netbsd-protos.h: New file. * gcc/config/netbsd.c: New file. * gcc/config/netbsd.h (SUBTARGET_INIT_BUILTINS): Define. * gcc/config/t-netbsd: New file. * gcc/config.gcc (tm_p_file): Add netbsd-protos.h. (tmake_file) Add t-netbsd. (extra_objs) Add netbsd.o. From-SVN: r253216 --- gcc/ChangeLog | 11 ++++++++ gcc/config.gcc | 4 ++- gcc/config/netbsd-protos.h | 20 ++++++++++++++ gcc/config/netbsd.c | 54 ++++++++++++++++++++++++++++++++++++++ gcc/config/netbsd.h | 6 +++++ gcc/config/t-netbsd | 21 +++++++++++++++ 6 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 gcc/config/netbsd-protos.h create mode 100644 gcc/config/netbsd.c create mode 100644 gcc/config/t-netbsd diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d80b6a07c13..07b6f494c54 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2017-09-26 Krister Walfridsson + + PR target/39570 + * gcc/config/netbsd-protos.h: New file. + * gcc/config/netbsd.c: New file. + * gcc/config/netbsd.h (SUBTARGET_INIT_BUILTINS): Define. + * gcc/config/t-netbsd: New file. + * gcc/config.gcc (tm_p_file): Add netbsd-protos.h. + (tmake_file) Add t-netbsd. + (extra_objs) Add netbsd.o. + 2017-09-26 Janus Weil PR fortran/82143 diff --git a/gcc/config.gcc b/gcc/config.gcc index e03b5cb6c3c..f0e6c4bd0c3 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -792,7 +792,9 @@ case ${target} in target_has_targetcm=yes ;; *-*-netbsd*) - tmake_file="t-slibgcc" + tm_p_file="${tm_p_file} netbsd-protos.h" + tmake_file="t-netbsd t-slibgcc" + extra_objs="${extra_objs} netbsd.o" gas=yes gnu_ld=yes use_gcc_stdint=wrap diff --git a/gcc/config/netbsd-protos.h b/gcc/config/netbsd-protos.h new file mode 100644 index 00000000000..59007c479c9 --- /dev/null +++ b/gcc/config/netbsd-protos.h @@ -0,0 +1,20 @@ +/* Prototypes. + Copyright (C) 2017 Free Software Foundation, Inc. + +This file is part of GCC. + +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. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +extern void netbsd_patch_builtins (void); diff --git a/gcc/config/netbsd.c b/gcc/config/netbsd.c new file mode 100644 index 00000000000..ed39f2794d6 --- /dev/null +++ b/gcc/config/netbsd.c @@ -0,0 +1,54 @@ +/* Functions for generic NetBSD as target machine for GNU C compiler. + Copyright (C) 2017 Free Software Foundation, Inc. + +This file is part of GCC. + +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. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "tm.h" +#include "tree.h" +#include "varasm.h" +#include "netbsd-protos.h" + +static void +netbsd_patch_builtin (enum built_in_function fncode) +{ + tree fn = builtin_decl_explicit (fncode); + tree sym; + char *newname; + + if (!fn) + return; + + sym = DECL_ASSEMBLER_NAME (fn); + newname = ACONCAT (("__c99_", IDENTIFIER_POINTER (sym), NULL)); + + set_user_assembler_name (fn, newname); + + fn = builtin_decl_implicit (fncode); + if (fn) + set_user_assembler_name (fn, newname); +} + +void +netbsd_patch_builtins (void) +{ + netbsd_patch_builtin (BUILT_IN_CABSF); + netbsd_patch_builtin (BUILT_IN_CABS); + netbsd_patch_builtin (BUILT_IN_CABSL); +} diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h index aafce9f9f5e..e84f1933444 100644 --- a/gcc/config/netbsd.h +++ b/gcc/config/netbsd.h @@ -164,3 +164,9 @@ along with GCC; see the file COPYING3. If not see #undef WINT_TYPE #define WINT_TYPE "int" + +#undef SUBTARGET_INIT_BUILTINS +#define SUBTARGET_INIT_BUILTINS \ + do { \ + netbsd_patch_builtins (); \ + } while(0) diff --git a/gcc/config/t-netbsd b/gcc/config/t-netbsd new file mode 100644 index 00000000000..770895b6d01 --- /dev/null +++ b/gcc/config/t-netbsd @@ -0,0 +1,21 @@ +# Copyright (C) 2017 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +netbsd.o: $(srcdir)/config/netbsd.c + $(COMPILE) $< + $(POSTCOMPILE) -- 2.30.2