diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config.gcc | 10 | ||||
| -rw-r--r-- | gcc/config/linux.c (renamed from gcc/config/linux-android.c) | 0 | ||||
| -rw-r--r-- | gcc/config/t-linux (renamed from gcc/config/t-linux-android) | 2 |
4 files changed, 13 insertions, 6 deletions
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 <maxim@kugelworks.com> + + * 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 <amodra@gmail.com> * 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.c index 4a4b48d..4a4b48d 100644 --- a/gcc/config/linux-android.c +++ b/gcc/config/linux.c diff --git a/gcc/config/t-linux-android b/gcc/config/t-linux index 75155f4..7451baf 100644 --- a/gcc/config/t-linux-android +++ b/gcc/config/t-linux @@ -16,6 +16,6 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. -linux-android.o: $(srcdir)/config/linux-android.c +linux.o: $(srcdir)/config/linux.c $(COMPILE) $< $(POSTCOMPILE) |