[llvm-commits] [compiler-rt] r150253 - in /compiler-rt/trunk: lib/ lib/arm/ lib/i386/ lib/ppc/ lib/x86_64/ make/platform/
Bob Wilson
bob.wilson at apple.com
Fri Feb 10 08:36:49 PST 2012
Author: bwilson
Date: Fri Feb 10 10:36:49 2012
New Revision: 150253
URL: http://llvm.org/viewvc/llvm-project?rev=150253&view=rev
Log:
Revert r150232 since it breaks the build when there's no ARM assembler.
Modified:
compiler-rt/trunk/lib/arm/adddf3vfp.S
compiler-rt/trunk/lib/arm/addsf3vfp.S
compiler-rt/trunk/lib/arm/comparesf2.S
compiler-rt/trunk/lib/arm/divdf3vfp.S
compiler-rt/trunk/lib/arm/divmodsi4.S
compiler-rt/trunk/lib/arm/divsf3vfp.S
compiler-rt/trunk/lib/arm/divsi3.S
compiler-rt/trunk/lib/arm/eqdf2vfp.S
compiler-rt/trunk/lib/arm/udivmodsi4.S
compiler-rt/trunk/lib/assembly.h
compiler-rt/trunk/lib/i386/ashldi3.S (props changed)
compiler-rt/trunk/lib/i386/ashrdi3.S (props changed)
compiler-rt/trunk/lib/i386/divdi3.S (props changed)
compiler-rt/trunk/lib/i386/floatdidf.S (props changed)
compiler-rt/trunk/lib/i386/floatdisf.S (props changed)
compiler-rt/trunk/lib/i386/floatdixf.S (props changed)
compiler-rt/trunk/lib/i386/floatundidf.S (props changed)
compiler-rt/trunk/lib/i386/floatundisf.S (props changed)
compiler-rt/trunk/lib/i386/floatundixf.S (props changed)
compiler-rt/trunk/lib/i386/lshrdi3.S (props changed)
compiler-rt/trunk/lib/i386/moddi3.S (props changed)
compiler-rt/trunk/lib/i386/muldi3.S (props changed)
compiler-rt/trunk/lib/i386/udivdi3.S (props changed)
compiler-rt/trunk/lib/i386/umoddi3.S (props changed)
compiler-rt/trunk/lib/ppc/restFP.S (props changed)
compiler-rt/trunk/lib/ppc/saveFP.S (props changed)
compiler-rt/trunk/lib/x86_64/floatundidf.S (props changed)
compiler-rt/trunk/lib/x86_64/floatundisf.S (props changed)
compiler-rt/trunk/lib/x86_64/floatundixf.S (props changed)
compiler-rt/trunk/make/platform/clang_darwin.mk
Modified: compiler-rt/trunk/lib/arm/adddf3vfp.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/adddf3vfp.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/adddf3vfp.S (original)
+++ compiler-rt/trunk/lib/arm/adddf3vfp.S Fri Feb 10 10:36:49 2012
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
//
Modified: compiler-rt/trunk/lib/arm/addsf3vfp.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/addsf3vfp.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/addsf3vfp.S (original)
+++ compiler-rt/trunk/lib/arm/addsf3vfp.S Fri Feb 10 10:36:49 2012
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
//
Modified: compiler-rt/trunk/lib/arm/comparesf2.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/comparesf2.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/comparesf2.S (original)
+++ compiler-rt/trunk/lib/arm/comparesf2.S Fri Feb 10 10:36:49 2012
@@ -37,6 +37,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
.syntax unified
Modified: compiler-rt/trunk/lib/arm/divdf3vfp.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/divdf3vfp.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/divdf3vfp.S (original)
+++ compiler-rt/trunk/lib/arm/divdf3vfp.S Fri Feb 10 10:36:49 2012
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
//
Modified: compiler-rt/trunk/lib/arm/divmodsi4.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/divmodsi4.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/divmodsi4.S (original)
+++ compiler-rt/trunk/lib/arm/divmodsi4.S Fri Feb 10 10:36:49 2012
@@ -13,6 +13,7 @@
*
*===----------------------------------------------------------------------===*/
+#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \
Modified: compiler-rt/trunk/lib/arm/divsf3vfp.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/divsf3vfp.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/divsf3vfp.S (original)
+++ compiler-rt/trunk/lib/arm/divsf3vfp.S Fri Feb 10 10:36:49 2012
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
//
Modified: compiler-rt/trunk/lib/arm/divsi3.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/divsi3.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/divsi3.S (original)
+++ compiler-rt/trunk/lib/arm/divsi3.S Fri Feb 10 10:36:49 2012
@@ -12,6 +12,7 @@
*
*===----------------------------------------------------------------------===*/
+#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \
Modified: compiler-rt/trunk/lib/arm/eqdf2vfp.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/eqdf2vfp.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/eqdf2vfp.S (original)
+++ compiler-rt/trunk/lib/arm/eqdf2vfp.S Fri Feb 10 10:36:49 2012
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#undef __thumb__
#include "../assembly.h"
//
Modified: compiler-rt/trunk/lib/arm/udivmodsi4.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/udivmodsi4.S?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/udivmodsi4.S (original)
+++ compiler-rt/trunk/lib/arm/udivmodsi4.S Fri Feb 10 10:36:49 2012
@@ -13,6 +13,7 @@
*
*===----------------------------------------------------------------------===*/
+#undef __thumb__
#include "../assembly.h"
#define ESTABLISH_FRAME \
Modified: compiler-rt/trunk/lib/assembly.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/assembly.h?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/lib/assembly.h (original)
+++ compiler-rt/trunk/lib/assembly.h Fri Feb 10 10:36:49 2012
@@ -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) \
Propchange: compiler-rt/trunk/lib/i386/ashldi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/ashrdi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/divdi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatdidf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatdisf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatdixf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatundidf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatundisf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/floatundixf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/lshrdi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/moddi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/muldi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/udivdi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/i386/umoddi3.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/ppc/restFP.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/ppc/saveFP.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/x86_64/floatundidf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/x86_64/floatundisf.S
------------------------------------------------------------------------------
(empty)
Propchange: compiler-rt/trunk/lib/x86_64/floatundixf.S
------------------------------------------------------------------------------
(empty)
Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=150253&r1=150252&r2=150253&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Fri Feb 10 10:36:49 2012
@@ -13,14 +13,9 @@
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 @@
# 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.
More information about the llvm-commits
mailing list