replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r150232 since it breaks the build when there's no ARM assembler. 

llvm-svn: 150253
This commit is contained in:
Bob Wilson 2012-02-10 16:36:49 +00:00
parent 04bbab586b
commit ddd971564e
11 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler-rt/lib/arm/adddf3vfp.S
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
//

1
compiler-rt/lib/arm/addsf3vfp.S
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
//

1
compiler-rt/lib/arm/comparesf2.S
View File

@ -37,6 +37,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
.syntax unified

1
compiler-rt/lib/arm/divdf3vfp.S
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
//

1
compiler-rt/lib/arm/divmodsi4.S
View File

@ -13,6 +13,7 @@
*
*===----------------------------------------------------------------------===*/
#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \

1
compiler-rt/lib/arm/divsf3vfp.S
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
//

1
compiler-rt/lib/arm/divsi3.S
View File

@ -12,6 +12,7 @@
*
*===----------------------------------------------------------------------===*/
#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \

1
compiler-rt/lib/arm/eqdf2vfp.S
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#undef __thumb__
#include "../assembly.h"
//

1
compiler-rt/lib/arm/udivmodsi4.S
View File

@ -13,6 +13,7 @@
*
*===----------------------------------------------------------------------===*/
#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \

23
compiler-rt/lib/assembly.h
View File

@ -34,26 +34,43 @@
#define GLUE(a, b) GLUE2(a, b)
#define SYMBOL_NAME(name) GLUE(__USER_LABEL_PREFIX__, name)
#ifdef VISIBILITY_HIDDEN
#if defined(VISIBILITY_HIDDEN)
#define DECLARE_SYMBOL_VISIBILITY(name) \
HIDDEN_DIRECTIVE SYMBOL_NAME(name) SEPARATOR
HIDDEN_DIRECTIVE name SEPARATOR
#else
#define DECLARE_SYMBOL_VISIBILITY(name)
#endif
#if defined(__APPLE__)
#define THUMB_FUNC(name) .thumb_func name
#else
#define THUMB_FUNC(name) .thumb_func
#endif
#if defined(__thumb__)
#define TARGET_FUNCTION_SETTINGS(name) \
THUMB_FUNC(name) SEPARATOR \
.code 16 SEPARATOR
#else
#define TARGET_FUNCTION_SETTINGS(name)
#endif
#define DEFINE_COMPILERRT_FUNCTION(name) \
.globl SYMBOL_NAME(name) SEPARATOR \
DECLARE_SYMBOL_VISIBILITY(name) \
DECLARE_SYMBOL_VISIBILITY(SYMBOL_NAME(name)) \
TARGET_FUNCTION_SETTINGS(SYMBOL_NAME(name)) \
SYMBOL_NAME(name):
#define DEFINE_COMPILERRT_PRIVATE_FUNCTION(name) \
.globl SYMBOL_NAME(name) SEPARATOR \
HIDDEN_DIRECTIVE SYMBOL_NAME(name) SEPARATOR \
TARGET_FUNCTION_SETTINGS(SYMBOL_NAME(name)) \
SYMBOL_NAME(name):
#define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \
.globl name SEPARATOR \
HIDDEN_DIRECTIVE name SEPARATOR \
TARGET_FUNCTION_SETTINGS(name) \
name:
#define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target) \

21
compiler-rt/make/platform/clang_darwin.mk
View File

@ -13,14 +13,9 @@ CheckArches = \
result=""; \
for arch in $(1); do \
if $(CC) -arch $$arch -c \
-integrated-as \
$(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
-isysroot $(ProjSrcRoot)/SDKs/darwin \
-o /dev/null > /dev/null 2> /dev/null; then \
result="$$result$$arch "; \
else \
printf 1>&2 \
"warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'\n"; \
fi; \
done; \
echo $$result)
@ -36,40 +31,40 @@ UniversalArchs :=
# still be referenced from Darwin system headers. This symbol is only ever
# needed on i386.
Configs += eprintf
UniversalArchs.eprintf := $(call CheckArches,i386,eprintf)
UniversalArchs.eprintf := $(call CheckArches,i386)
# Configuration for targetting 10.4. We need a few functions missing from
# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really
# support targetting PowerPC.
Configs += 10.4
UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4)
UniversalArchs.10.4 := $(call CheckArches,i386 x86_64)
# Configuration for targetting iOS, for some ARMv6 functions, which must be
# in the same linkage unit, and for a couple of other functions that didn't
# make it into libSystem.
Configs += ios
UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv6 armv7,ios)
UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv6 armv7)
# Configuration for targetting OSX. These functions may not be in libSystem
# so we should provide our own.
Configs += osx
UniversalArchs.osx := $(call CheckArches,i386 x86_64,osx)
UniversalArchs.osx := $(call CheckArches,i386 x86_64)
# Configuration for use with kernel/kexts.
Configs += cc_kext
UniversalArchs.cc_kext := $(call CheckArches,armv6 armv7 i386 x86_64,cc_kext)
UniversalArchs.cc_kext := $(call CheckArches,armv6 armv7 i386 x86_64)
# Configurations which define the profiling support functions.
Configs += profile_osx
UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64)
Configs += profile_ios
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv6 armv7,profile_ios)
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv6 armv7)
# Configurations which define the ASAN support functions.
#
# Note that ASAN doesn't appear to currently support i386.
Configs += asan_osx
UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64)
# If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
# are intended to support and limit what we try to build to that.