From 617ceb129eca96a19c0b14878f3a86081050945a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Sat, 6 Jul 2013 15:36:25 +0200 Subject: Remove obsolete GCC 4.4.3 toolchain. This remove the 4.4.3 toolchain from the NDK, and slightly updates documentation to not mention it anymore. Change-Id: Ia42cd54e3a4e88ba5ee3ea35d9ee3cc4b9237ca2 --- toolchains/arm-linux-androideabi-4.4.3/config.mk | 20 ----- toolchains/arm-linux-androideabi-4.4.3/setup.mk | 108 ----------------------- toolchains/mipsel-linux-android-4.4.3/config.mk | 20 ----- toolchains/mipsel-linux-android-4.4.3/setup.mk | 67 -------------- toolchains/x86-4.4.3/config.mk | 20 ----- toolchains/x86-4.4.3/setup.mk | 68 -------------- 6 files changed, 303 deletions(-) delete mode 100644 toolchains/arm-linux-androideabi-4.4.3/config.mk delete mode 100644 toolchains/arm-linux-androideabi-4.4.3/setup.mk delete mode 100644 toolchains/mipsel-linux-android-4.4.3/config.mk delete mode 100644 toolchains/mipsel-linux-android-4.4.3/setup.mk delete mode 100644 toolchains/x86-4.4.3/config.mk delete mode 100644 toolchains/x86-4.4.3/setup.mk (limited to 'toolchains') diff --git a/toolchains/arm-linux-androideabi-4.4.3/config.mk b/toolchains/arm-linux-androideabi-4.4.3/config.mk deleted file mode 100644 index 2547cd409..000000000 --- a/toolchains/arm-linux-androideabi-4.4.3/config.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# config file for the arm gcc-4.4.3 toolchain for the Android NDK -# the real meat is in the setup.mk file adjacent to this one -# -TOOLCHAIN_ARCH := arm -TOOLCHAIN_ABIS := armeabi armeabi-v7a diff --git a/toolchains/arm-linux-androideabi-4.4.3/setup.mk b/toolchains/arm-linux-androideabi-4.4.3/setup.mk deleted file mode 100644 index 76dbddf1b..000000000 --- a/toolchains/arm-linux-androideabi-4.4.3/setup.mk +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# this file is used to prepare the NDK to build with the arm gcc-4.4.3 -# toolchain any number of source files -# -# its purpose is to define (or re-define) templates used to build -# various sources into target object files, libraries or executables. -# -# Note that this file may end up being parsed several times in future -# revisions of the NDK. -# - -TARGET_CFLAGS := \ - -fpic \ - -ffunction-sections \ - -funwind-tables \ - -fstack-protector - -TARGET_LDFLAGS := - -TARGET_C_INCLUDES := \ - $(SYSROOT_INC)/usr/include - -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - TARGET_CFLAGS += -march=armv7-a \ - -mfloat-abi=softfp \ - -mfpu=vfpv3-d16 - - TARGET_LDFLAGS += -march=armv7-a \ - -Wl,--fix-cortex-a8 -else - TARGET_CFLAGS += -march=armv5te \ - -mtune=xscale \ - -msoft-float -endif - -TARGET_CFLAGS.neon := -mfpu=neon - -TARGET_arm_release_CFLAGS := -O2 \ - -g \ - -DNDEBUG \ - -fomit-frame-pointer \ - -fstrict-aliasing \ - -funswitch-loops \ - -finline-limit=300 - -TARGET_thumb_release_CFLAGS := -mthumb \ - -Os \ - -g \ - -DNDEBUG \ - -fomit-frame-pointer \ - -fno-strict-aliasing \ - -finline-limit=64 - -# When building for debug, compile everything as arm. -TARGET_arm_debug_CFLAGS := $(TARGET_arm_release_CFLAGS) \ - -O0 \ - -UNDEBUG \ - -fno-omit-frame-pointer \ - -fno-strict-aliasing - -TARGET_thumb_debug_CFLAGS := $(TARGET_thumb_release_CFLAGS) \ - -O0 \ - -UNDEBUG \ - -marm \ - -fno-omit-frame-pointer - -# This function will be called to determine the target CFLAGS used to build -# a C or Assembler source file, based on its tags. -# -TARGET-process-src-files-tags = \ -$(eval __arm_sources := $(call get-src-files-with-tag,arm)) \ -$(eval __thumb_sources := $(call get-src-files-without-tag,arm)) \ -$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \ -$(eval __release_sources := $(call get-src-files-without-tag,debug)) \ -$(call set-src-files-target-cflags, \ - $(call set_intersection,$(__arm_sources),$(__debug_sources)), \ - $(TARGET_arm_debug_CFLAGS)) \ -$(call set-src-files-target-cflags,\ - $(call set_intersection,$(__arm_sources),$(__release_sources)),\ - $(TARGET_arm_release_CFLAGS)) \ -$(call set-src-files-target-cflags,\ - $(call set_intersection,$(__arm_sources),$(__debug_sources)),\ - $(TARGET_arm_debug_CFLAGS)) \ -$(call set-src-files-target-cflags,\ - $(call set_intersection,$(__thumb_sources),$(__release_sources)),\ - $(TARGET_thumb_release_CFLAGS)) \ -$(call set-src-files-target-cflags,\ - $(call set_intersection,$(__thumb_sources),$(__debug_sources)),\ - $(TARGET_thumb_debug_CFLAGS)) \ -$(call add-src-files-target-cflags,\ - $(call get-src-files-with-tag,neon),\ - $(TARGET_CFLAGS.neon)) \ -$(call set-src-files-text,$(__arm_sources),arm$(space)$(space)) \ -$(call set-src-files-text,$(__thumb_sources),thumb) diff --git a/toolchains/mipsel-linux-android-4.4.3/config.mk b/toolchains/mipsel-linux-android-4.4.3/config.mk deleted file mode 100644 index b4dbc326c..000000000 --- a/toolchains/mipsel-linux-android-4.4.3/config.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# config file for the mipsel gcc-4.4.3 toolchain for the Android NDK -# the real meat is in the setup.mk file adjacent to this one -# -TOOLCHAIN_ARCH := mips -TOOLCHAIN_ABIS := mips diff --git a/toolchains/mipsel-linux-android-4.4.3/setup.mk b/toolchains/mipsel-linux-android-4.4.3/setup.mk deleted file mode 100644 index c4c61b906..000000000 --- a/toolchains/mipsel-linux-android-4.4.3/setup.mk +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# this file is used to prepare the NDK to build with the mipsel gcc-4.4.3 -# toolchain any number of source files -# -# its purpose is to define (or re-define) templates used to build -# various sources into target object files, libraries or executables. -# -# Note that this file may end up being parsed several times in future -# revisions of the NDK. -# - -TARGET_CFLAGS := \ - -fpic \ - -fno-strict-aliasing \ - -finline-functions \ - -ffunction-sections \ - -funwind-tables \ - -fmessage-length=0 \ - -fno-inline-functions-called-once \ - -fgcse-after-reload \ - -frerun-cse-after-loop \ - -frename-registers \ - -TARGET_LDFLAGS := - -TARGET_C_INCLUDES := \ - $(SYSROOT_INC)/usr/include - -TARGET_mips_release_CFLAGS := -O2 \ - -g \ - -DNDEBUG \ - -fomit-frame-pointer \ - -funswitch-loops \ - -finline-limit=300 - -TARGET_mips_debug_CFLAGS := -O0 \ - -g \ - -fno-omit-frame-pointer - - -# This function will be called to determine the target CFLAGS used to build -# a C or Assembler source file, based on its tags. -TARGET-process-src-files-tags = \ -$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \ -$(eval __release_sources := $(call get-src-files-without-tag,debug)) \ -$(call set-src-files-target-cflags, \ - $(__debug_sources),\ - $(TARGET_mips_debug_CFLAGS)) \ -$(call set-src-files-target-cflags,\ - $(__release_sources),\ - $(TARGET_mips_release_CFLAGS)) \ -$(call set-src-files-text,$(__debug_sources),mips$(space)) \ -$(call set-src-files-text,$(__release_sources),mips$(space)) \ diff --git a/toolchains/x86-4.4.3/config.mk b/toolchains/x86-4.4.3/config.mk deleted file mode 100644 index de7c84c60..000000000 --- a/toolchains/x86-4.4.3/config.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# config file for the x86 gcc-4.4.3 toolchain for the Android NDK -# the real meat is in the setup.mk file adjacent to this one -# -TOOLCHAIN_ARCH := x86 -TOOLCHAIN_ABIS := x86 diff --git a/toolchains/x86-4.4.3/setup.mk b/toolchains/x86-4.4.3/setup.mk deleted file mode 100644 index 32beac6ed..000000000 --- a/toolchains/x86-4.4.3/setup.mk +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# this file is used to prepare the NDK to build with the x86 gcc-4.4.3 -# toolchain any number of source files -# -# its purpose is to define (or re-define) templates used to build -# various sources into target object files, libraries or executables. -# -# Note that this file may end up being parsed several times in future -# revisions of the NDK. -# - -TOOLCHAIN_NAME := x86-4.4.3 -TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android- - -TARGET_CFLAGS := \ - -ffunction-sections \ - -funwind-tables - -TARGET_C_INCLUDES := \ - $(SYSROOT_INC)/usr/include - -# Add and LDFLAGS for the target here -# TARGET_LDFLAGS := - -TARGET_CFLAGS += -fstack-protector - -TARGET_x86_release_CFLAGS := -O2 \ - -g \ - -DNDEBUG \ - -fomit-frame-pointer \ - -fstrict-aliasing \ - -funswitch-loops \ - -finline-limit=300 - -# When building for debug, compile everything as x86. -TARGET_x86_debug_CFLAGS := $(TARGET_x86_release_CFLAGS) \ - -O0 \ - -UNDEBUG \ - -fno-omit-frame-pointer \ - -fno-strict-aliasing - -# This function will be called to determine the target CFLAGS used to build -# a C or Assembler source file, based on its tags. -# -TARGET-process-src-files-tags = \ -$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \ -$(eval __release_sources := $(call get-src-files-without-tag,debug)) \ -$(call set-src-files-target-cflags, $(__debug_sources), $(TARGET_x86_debug_CFLAGS)) \ -$(call set-src-files-target-cflags, $(__release_sources),$(TARGET_x86_release_CFLAGS)) \ -$(call set-src-files-text,$(LOCAL_SRC_FILES),x86$(space)$(space)) \ - -# The ABI-specific sub-directory that the SDK tools recognize for -# this toolchain's generated binaries -TARGET_ABI_SUBDIR := x86 -- cgit v1.2.3