t-linux-androideabi: New.

	* config/arm/t-linux-androideabi: New.
	* config.gcc (arm*-*-linux-androideabi): Include multilib configuration.

From-SVN: r160095

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5ae92ba2dbb796461b2c4dd055038721505e903..6660479a9842cc4d9c3608b786f337a2f7d27d34 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+       * config/arm/t-linux-androideabi: New.
+       * config.gcc (arm*-*-linux-androideabi): Include multilib configuration.
+
 2010-06-01  Jan Hubicka  <jh@suse.cz>
 
        * tree-inline.c (estimate_num_insns): For stdarg functions look

diff --git a/gcc/config.gcc b/gcc/config.gcc
index fbee45e6cbc694e680339c72fee14d4aba4db903..3b74b689a5279086588c7ad1677c9a2940a879ef 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -744,6 +744,12 @@ arm*-*-linux*)                     # ARM GNU/Linux with ELF
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+           # Define multilib configuration for arm-linux-androideabi.
+           case ${target} in
+           *-androideabi)
+               tmake_file="$tmake_file arm/t-linux-androideabi"
+               ;;
+           esac
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            # TImode.

diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
new file mode 100644 (file)
index 0000000..8f1307c
--- /dev/null
+++ b/gcc/config/arm/t-linux-androideabi
@@ -0,0 +1,10 @@
+MULTILIB_OPTIONS     = march=armv7-a mthumb
+MULTILIB_DIRNAMES    = armv7-a thumb
+MULTILIB_EXCEPTIONS  =
+MULTILIB_MATCHES     =
+MULTILIB_OSDIRNAMES  =
+
+# The "special" multilib can be used to build native applications for Android,
+# as opposed to native shared libraries that are then called via JNI.
+#MULTILIB_OPTIONS    += tno-android-cc
+#MULTILIB_DIRNAMES   += special