diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64df290..3d71474 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,21 @@ +2013-01-14 Alexander Ivchenko + + * gcc/target.def (TARGET_HAS_IFUNC_P): New target hook. + * gcc/doc/tm.texi.in (TARGET_HAS_IFUNC_P): New. + * gcc/doc/tm.texi: Regenerate. + * gcc/targhooks.h (default_have_ifunc_p): New. + * gcc/targhooks.c (default_have_ifunc_p): Ditto. + * gcc/config/linux-protos.h: New file. + * gcc/config/linux-androids.h (TARGET_HAS_IFUNC_P): Using version of + this hook for linux which disables support of indirect functions in + android. + * gcc/config/linux-android.c: New file. + * gcc/config/t-linux-android.c: Ditto. + * gcc/config.gcc: Added new object file linux-android.o. + * gcc/config/i386/i386.c (ix86_get_function_versions_dispatcher): + Using TARGET_HAS_IFUNC hook instead of HAVE_GNU_INDIRECT_FUNCTION. + * gcc/varasm.c (do_assemble_alias): Likewise. + 2013-01-14 Georg-Johann Lay * config/avr/avr-stdint.h: Remove trailing blanks. diff --git a/gcc/config.gcc b/gcc/config.gcc index 7deac33..26602d2 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -636,6 +636,11 @@ case ${target} in native_system_header_dir=/include ;; esac + case $target in + *linux*) + tm_p_file="${tm_p_file} linux-protos.h" + ;; + esac # glibc / uclibc / bionic switch. # uclibc and bionic aren't usable for GNU/Hurd and neither for GNU/k*BSD. case $target in @@ -661,8 +666,10 @@ case ${target} in # Add Android userspace support to Linux targets. case $target in *linux*) + tmake_file="${tmake_file} t-linux-android" tm_file="$tm_file linux-android.h" extra_options="$extra_options linux-android.opt" + extra_objs="$extra_objs linux-android.o" ;; esac # Enable compilation for Android by default for *android* targets. @@ -863,7 +870,9 @@ arm*-*-netbsdelf*) tmake_file="${tmake_file} arm/t-arm" ;; arm*-*-linux-*) # ARM GNU/Linux with ELF + tmake_file="${tmake_file} t-linux-android" tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" + extra_objs="$extra_objs linux-android.o" case $target in arm*b-*-linux*) tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 4f778c1..1cf4f94 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -29142,7 +29142,7 @@ make_name (tree decl, const char *suffix, bool make_unique) return global_var_name; } -#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) && HAVE_GNU_INDIRECT_FUNCTION +#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) /* Make a dispatcher declaration for the multi-versioned function DECL. Calls to DECL function will be replaced with calls to the dispatcher @@ -29209,12 +29209,6 @@ ix86_get_function_versions_dispatcher (void *decl) tree dispatch_decl = NULL; -#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) && HAVE_GNU_INDIRECT_FUNCTION - struct cgraph_function_version_info *it_v = NULL; - struct cgraph_node *dispatcher_node = NULL; - struct cgraph_function_version_info *dispatcher_version_info = NULL; -#endif - struct cgraph_function_version_info *default_version_info = NULL; gcc_assert (fn != NULL && DECL_FUNCTION_VERSIONED (fn)); @@ -29259,30 +29253,40 @@ ix86_get_function_versions_dispatcher (void *decl) default_node = default_version_info->this_node; -#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) && HAVE_GNU_INDIRECT_FUNCTION - /* Right now, the dispatching is done via ifunc. */ - dispatch_decl = make_dispatcher_decl (default_node->symbol.decl); - - dispatcher_node = cgraph_get_create_node (dispatch_decl); - gcc_assert (dispatcher_node != NULL); - dispatcher_node->dispatcher_function = 1; - dispatcher_version_info - = insert_new_cgraph_node_version (dispatcher_node); - dispatcher_version_info->next = default_version_info; - dispatcher_node->local.finalized = 1; - - /* Set the dispatcher for all the versions. */ - it_v = default_version_info; - while (it_v != NULL) +#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) + if (targetm.has_ifunc_p ()) { - it_v->dispatcher_resolver = dispatch_decl; - it_v = it_v->next; + struct cgraph_function_version_info *it_v = NULL; + struct cgraph_node *dispatcher_node = NULL; + struct cgraph_function_version_info *dispatcher_version_info = NULL; + + /* Right now, the dispatching is done via ifunc. */ + dispatch_decl = make_dispatcher_decl (default_node->symbol.decl); + + dispatcher_node = cgraph_get_create_node (dispatch_decl); + gcc_assert (dispatcher_node != NULL); + dispatcher_node->dispatcher_function = 1; + dispatcher_version_info + = insert_new_cgraph_node_version (dispatcher_node); + dispatcher_version_info->next = default_version_info; + dispatcher_node->local.finalized = 1; + + /* Set the dispatcher for all the versions. */ + it_v = default_version_info; + while (it_v != NULL) + { + it_v->dispatcher_resolver = dispatch_decl; + it_v = it_v->next; + } } -#else - error_at (DECL_SOURCE_LOCATION (default_node->symbol.decl), - "multiversioning needs ifunc which is not supported " - "in this configuration"); + else #endif + { + error_at (DECL_SOURCE_LOCATION (default_node->symbol.decl), + "multiversioning needs ifunc which is not supported " + "on this target"); + } + return dispatch_decl; } diff --git a/gcc/config/linux-android.c b/gcc/config/linux-android.c new file mode 100644 index 0000000..f3d82a5 --- /dev/null +++ b/gcc/config/linux-android.c @@ -0,0 +1,34 @@ +/* Functions for Linux Android as target machine for GNU C compiler. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010, 2011, + 2012, 2013. + 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 "linux-protos.h" + +/* Android does not support GNU indirect functions. */ + +bool +linux_android_has_ifunc_p (void) +{ + return TARGET_ANDROID ? false : HAVE_GNU_INDIRECT_FUNCTION; +} diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h index 2c87c84..831a19c 100644 --- a/gcc/config/linux-android.h +++ b/gcc/config/linux-android.h @@ -57,3 +57,6 @@ #define ANDROID_ENDFILE_SPEC \ "%{shared: crtend_so%O%s;: crtend_android%O%s}" + +#undef TARGET_HAS_IFUNC_P +#define TARGET_HAS_IFUNC_P linux_android_has_ifunc_p diff --git a/gcc/config/linux-protos.h b/gcc/config/linux-protos.h new file mode 100644 index 0000000..aae1d28 --- /dev/null +++ b/gcc/config/linux-protos.h @@ -0,0 +1,22 @@ +/* Prototypes. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010, 2011, + 2012, 2013 + 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 bool linux_android_has_ifunc_p (void); diff --git a/gcc/config/t-linux-android b/gcc/config/t-linux-android new file mode 100644 index 0000000..6f9b033 --- /dev/null +++ b/gcc/config/t-linux-android @@ -0,0 +1,23 @@ +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 +# 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 +# . + +linux-android.o: $(srcdir)/config/linux-android.c $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) $(TM_P_H) + $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + $(srcdir)/config/linux-android.c diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index 9d6f6bc..18e464c 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -11346,3 +11346,9 @@ memory model bits are allowed. @deftypevr {Target Hook} {unsigned char} TARGET_ATOMIC_TEST_AND_SET_TRUEVAL This value should be set if the result written by @code{atomic_test_and_set} is not exactly 1, i.e. the @code{bool} @code{true}. @end deftypevr + +@deftypefn {Target Hook} bool TARGET_HAS_IFUNC_P (void) +It returns true if the target supports GNU indirect functions. +The support includes the assembler, linker and dynamic linker. +The default value of this hook is based on target's libc. +@end deftypefn diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index 3668882..e1d6cff 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -11182,3 +11182,5 @@ memory model bits are allowed. @end deftypefn @hook TARGET_ATOMIC_TEST_AND_SET_TRUEVAL + +@hook TARGET_HAS_IFUNC_P diff --git a/gcc/target.def b/gcc/target.def index 8627923..c257d4f 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -1518,6 +1518,15 @@ DEFHOOK bool, (const_rtx x), default_use_anchors_for_symbol_p) +/* True if target supports indirect functions. */ +DEFHOOK +(has_ifunc_p, + "It returns true if the target supports GNU indirect functions.\n\ +The support includes the assembler, linker and dynamic linker.\n\ +The default value of this hook is based on target's libc.", + bool, (void), + default_have_ifunc_p) + /* True if it is OK to do sibling call optimization for the specified call expression EXP. DECL will be the called function, or NULL if this is an indirect call. */ diff --git a/gcc/targhooks.c b/gcc/targhooks.c index 6c12a4a..e5ce81f 100644 --- a/gcc/targhooks.c +++ b/gcc/targhooks.c @@ -450,6 +450,14 @@ default_fixed_point_supported_p (void) return ENABLE_FIXED_POINT; } +/* True if the target supports GNU indirect functions. */ + +bool +default_have_ifunc_p (void) +{ + return HAVE_GNU_INDIRECT_FUNCTION; +} + /* NULL if INSN insn is valid within a low-overhead loop, otherwise returns an error message. diff --git a/gcc/targhooks.h b/gcc/targhooks.h index d23b352..4d11768 100644 --- a/gcc/targhooks.h +++ b/gcc/targhooks.h @@ -72,6 +72,8 @@ extern bool targhook_float_words_big_endian (void); extern bool default_decimal_float_supported_p (void); extern bool default_fixed_point_supported_p (void); +extern bool default_have_ifunc_p (void); + extern const char * default_invalid_within_doloop (const_rtx); extern tree default_builtin_vectorized_function (tree, tree, tree); diff --git a/gcc/varasm.c b/gcc/varasm.c index 0b1894d..4f3a8db 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -5489,14 +5489,15 @@ do_assemble_alias (tree decl, tree target) } if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (decl))) { -#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) && HAVE_GNU_INDIRECT_FUNCTION - ASM_OUTPUT_TYPE_DIRECTIVE - (asm_out_file, IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)), - IFUNC_ASM_TYPE); -#else - error_at (DECL_SOURCE_LOCATION (decl), - "ifunc is not supported in this configuration"); +#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) + if (targetm.has_ifunc_p ()) + ASM_OUTPUT_TYPE_DIRECTIVE + (asm_out_file, IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)), + IFUNC_ASM_TYPE); + else #endif + error_at (DECL_SOURCE_LOCATION (decl), + "ifunc is not supported on this target"); } # ifdef ASM_OUTPUT_DEF_FROM_DECLS