From 2c20a1914acb75c3c654893a490b96b2df2edc7a Mon Sep 17 00:00:00 2001
From: Bruce Beare <brucex.j.beare@intel.com>
Date: Thu, 11 Mar 2010 15:17:24 -0800
Subject: gcc 4.2.1 compiler build for IA Android target

Change-Id: Ia07619d01a24804c9c8c4e6bce925f76289f249d
---
 gcc-4.2.1/gcc/config.gcc            | 1 +
 gcc-4.2.1/gcc/config/i386/t-android | 6 ++++++
 gcc-4.2.1/gcc/ginclude/stddef.h     | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 gcc-4.2.1/gcc/config/i386/t-android

(limited to 'gcc-4.2.1')

diff --git a/gcc-4.2.1/gcc/config.gcc b/gcc-4.2.1/gcc/config.gcc
index 58c564b80..2154bfc89 100644
--- a/gcc-4.2.1/gcc/config.gcc
+++ b/gcc-4.2.1/gcc/config.gcc
@@ -1095,6 +1095,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
 			# with ELF format using glibc 2
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
 	case ${target} in
+	i[34567]86-android*-gnu) tmake_file="${tmake_file} i386/t-android" ;;
 	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
 	i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
 	esac
diff --git a/gcc-4.2.1/gcc/config/i386/t-android b/gcc-4.2.1/gcc/config/i386/t-android
new file mode 100644
index 000000000..8c6791d1f
--- /dev/null
+++ b/gcc-4.2.1/gcc/config/i386/t-android
@@ -0,0 +1,6 @@
+# bionic library tweaks for Android.
+
+# Disable building libunwind functinality.
+# UNWIND_H = 
+LIB2ADDEH = 
+LIB2ADDEHDEP = 
diff --git a/gcc-4.2.1/gcc/ginclude/stddef.h b/gcc-4.2.1/gcc/ginclude/stddef.h
index 7e6179595..4f94ba634 100644
--- a/gcc-4.2.1/gcc/ginclude/stddef.h
+++ b/gcc-4.2.1/gcc/ginclude/stddef.h
@@ -411,6 +411,7 @@ typedef __WINT_TYPE__ wint_t;
 #ifdef _STDDEF_H
 
 /* Offset of member MEMBER in a struct of type TYPE. */
+#undef offsetof
 #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
 
 #endif /* _STDDEF_H was defined this time */
-- 
cgit v1.2.3