From 5c0b2c6e7f09d0c71b21ccaa68b47f05df766a5f Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Sat, 7 Dec 2013 08:46:47 +0000 Subject: Rename files for libc selection on Linux targets. * linux-android.c: Rename to linux.c. * t-linux-android: Rename to t-linux. Update references to linux-android.c * config.gcc: Update references to t-linux-android and linux-android.o. From-SVN: r205777 --- gcc/ChangeLog | 7 +++++++ gcc/config.gcc | 10 +++++----- gcc/config/linux-android.c | 47 ---------------------------------------------- gcc/config/linux.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ gcc/config/t-linux | 21 +++++++++++++++++++++ gcc/config/t-linux-android | 21 --------------------- 6 files changed, 80 insertions(+), 73 deletions(-) delete mode 100644 gcc/config/linux-android.c create mode 100644 gcc/config/linux.c create mode 100644 gcc/config/t-linux delete mode 100644 gcc/config/t-linux-android (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 12e698a..89aa2a2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2013-12-07 Maxim Kuvyrkov + + * linux-android.c: Rename to linux.c. + * t-linux-android: Rename to t-linux. Update references + to linux-android.c + * config.gcc: Update references to t-linux-android and linux-android.o. + 2013-12-07 Alan Modra * config/rs6000/rs6000.md (bswapdi2_32bit): Remove ?? from r->r diff --git a/gcc/config.gcc b/gcc/config.gcc index 230c524..61d611a 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -702,10 +702,10 @@ case ${target} in case $target in *linux*) tm_p_file="${tm_p_file} linux-protos.h" - tmake_file="${tmake_file} t-linux-android" + tmake_file="${tmake_file} t-linux" + extra_objs="$extra_objs linux.o" 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. @@ -1000,7 +1000,7 @@ arm*-*-linux-*) # ARM GNU/Linux with ELF esac tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi" tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h" - extra_objs="$extra_objs linux-android.o" + extra_objs="$extra_objs linux.o" # Define multilib configuration for arm-linux-androideabi. case ${target} in *-androideabi) @@ -1074,7 +1074,7 @@ bfin*-uclinux*) ;; bfin*-linux-uclibc*) tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h" - tmake_file="bfin/t-bfin-linux t-slibgcc t-linux-android" + tmake_file="bfin/t-bfin-linux t-slibgcc t-linux" use_collect2=no ;; bfin*-rtems*) @@ -1109,7 +1109,7 @@ cris-*-elf | cris-*-none) crisv32-*-linux* | cris-*-linux*) tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h glibc-stdint.h cris/linux.h" # We need to avoid using t-linux, so override default tmake_file - tmake_file="cris/t-cris cris/t-linux t-slibgcc t-linux-android" + tmake_file="cris/t-cris cris/t-linux t-slibgcc t-linux" extra_options="${extra_options} cris/linux.opt" case $target in cris-*-*) diff --git a/gcc/config/linux-android.c b/gcc/config/linux-android.c deleted file mode 100644 index 4a4b48d..0000000 --- a/gcc/config/linux-android.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Functions for Linux Android as target machine for GNU C compiler. - Copyright (C) 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; -} - -bool -linux_android_libc_has_function (enum function_class fn_class) -{ - if (OPTION_GLIBC) - return true; - if (OPTION_BIONIC) - if (fn_class == function_c94 - || fn_class == function_c99_misc - || fn_class == function_sincos) - return true; - - return false; -} diff --git a/gcc/config/linux.c b/gcc/config/linux.c new file mode 100644 index 0000000..4a4b48d --- /dev/null +++ b/gcc/config/linux.c @@ -0,0 +1,47 @@ +/* Functions for Linux Android as target machine for GNU C compiler. + Copyright (C) 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; +} + +bool +linux_android_libc_has_function (enum function_class fn_class) +{ + if (OPTION_GLIBC) + return true; + if (OPTION_BIONIC) + if (fn_class == function_c94 + || fn_class == function_c99_misc + || fn_class == function_sincos) + return true; + + return false; +} diff --git a/gcc/config/t-linux b/gcc/config/t-linux new file mode 100644 index 0000000..7451baf --- /dev/null +++ b/gcc/config/t-linux @@ -0,0 +1,21 @@ +# Copyright (C) 2002-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.o: $(srcdir)/config/linux.c + $(COMPILE) $< + $(POSTCOMPILE) diff --git a/gcc/config/t-linux-android b/gcc/config/t-linux-android deleted file mode 100644 index 75155f4..0000000 --- a/gcc/config/t-linux-android +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2002-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 - $(COMPILE) $< - $(POSTCOMPILE) -- cgit v1.1