* [committed] Fix PR 39570 - cabs/cabsf named differently on NetBSD
@ 2017-09-26 22:29 Krister Walfridsson
0 siblings, 0 replies; only message in thread
From: Krister Walfridsson @ 2017-09-26 22:29 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: TEXT/PLAIN, Size: 988 bytes --]
I have committed the attached patch to fix PR 39570.
The problem is that the NetBSD cabs/cabsf/cabsl funcions are called
__c99_cabs etc. as NetBSD needed to change the ABI before it had symbol
versioning. This is handled in the system header file as
double cabs(double _Complex) __asm("__c99_cabs");
but __builtin_cabs still generates a call to cabs (which fails much of the
fortran testsuite).
I have fixed this by using SUBTARGET_INIT_BUILTINS in the same way as
Darwin is solving a similar problem.
Bootstrapped and tested on i386-unknown-netbsdelf6.1 and
x86_64-unknown-netbsd6.1.
/Krister
2017-09-26 Krister Walfridsson <krister.walfridsson@gmail.com>
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.
[-- Attachment #2: Type: TEXT/PLAIN, Size: 4602 bytes --]
Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc (revision 253215)
+++ gcc/config.gcc (revision 253216)
@@ -792,7 +792,9 @@
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
Index: gcc/config/t-netbsd
===================================================================
--- gcc/config/t-netbsd (nonexistent)
+++ gcc/config/t-netbsd (revision 253216)
@@ -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
+# <http://www.gnu.org/licenses/>.
+
+netbsd.o: $(srcdir)/config/netbsd.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
Index: gcc/config/netbsd.c
===================================================================
--- gcc/config/netbsd.c (nonexistent)
+++ gcc/config/netbsd.c (revision 253216)
@@ -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
+<http://www.gnu.org/licenses/>. */
+
+#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);
+}
Index: gcc/config/netbsd.h
===================================================================
--- gcc/config/netbsd.h (revision 253215)
+++ gcc/config/netbsd.h (revision 253216)
@@ -164,3 +164,9 @@
#undef WINT_TYPE
#define WINT_TYPE "int"
+
+#undef SUBTARGET_INIT_BUILTINS
+#define SUBTARGET_INIT_BUILTINS \
+ do { \
+ netbsd_patch_builtins (); \
+ } while(0)
Index: gcc/config/netbsd-protos.h
===================================================================
--- gcc/config/netbsd-protos.h (nonexistent)
+++ gcc/config/netbsd-protos.h (revision 253216)
@@ -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
+<http://www.gnu.org/licenses/>. */
+
+extern void netbsd_patch_builtins (void);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-09-26 22:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-26 22:29 [committed] Fix PR 39570 - cabs/cabsf named differently on NetBSD Krister Walfridsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).