Move original compiler-rt functions (libgcc replacement) to lib/builtins directory

llvm-svn: 201393

240 files changed, 271 insertions, 259 deletions

diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt
index 506f88d0b8a..9c4e29894a1 100644
--- a/compiler-rt/lib/CMakeLists.txt
+++ b/compiler-rt/lib/CMakeLists.txt
@@ -33,240 +33,7 @@ if(LLVM_USE_SANITIZER STREQUAL "")
   endif()
 endif()
 
-# The top-level lib directory contains a large amount of C code which provides
-# generic implementations of the core runtime library along with optimized
-# architecture-specific code in various subdirectories.
-
-set(GENERIC_SOURCES
-  absvdi2.c
-  absvsi2.c
-  absvti2.c
-  adddf3.c
-  addsf3.c
-  addvdi3.c
-  addvsi3.c
-  addvti3.c
-  apple_versioning.c
-  ashldi3.c
-  ashlti3.c
-  ashrdi3.c
-  ashrti3.c
-  # FIXME: atomic.c may only be compiled if host compiler understands _Atomic
-  # atomic.c
-  clear_cache.c
-  clzdi2.c
-  clzsi2.c
-  clzti2.c
-  cmpdi2.c
-  cmpti2.c
-  comparedf2.c
-  comparesf2.c
-  ctzdi2.c
-  ctzsi2.c
-  ctzti2.c
-  divdc3.c
-  divdf3.c
-  divdi3.c
-  divmoddi4.c
-  divmodsi4.c
-  divsc3.c
-  divsf3.c
-  divsi3.c
-  divti3.c
-  divxc3.c
-  enable_execute_stack.c
-  eprintf.c
-  extendsfdf2.c
-  ffsdi2.c
-  ffsti2.c
-  fixdfdi.c
-  fixdfsi.c
-  fixdfti.c
-  fixsfdi.c
-  fixsfsi.c
-  fixsfti.c
-  fixunsdfdi.c
-  fixunsdfsi.c
-  fixunsdfti.c
-  fixunssfdi.c
-  fixunssfsi.c
-  fixunssfti.c
-  fixunsxfdi.c
-  fixunsxfsi.c
-  fixunsxfti.c
-  fixxfdi.c
-  fixxfti.c
-  floatdidf.c
-  floatdisf.c
-  floatdixf.c
-  floatsidf.c
-  floatsisf.c
-  floattidf.c
-  floattisf.c
-  floattixf.c
-  floatundidf.c
-  floatundisf.c
-  floatundixf.c
-  floatunsidf.c
-  floatunsisf.c
-  floatuntidf.c
-  floatuntisf.c
-  floatuntixf.c
-  gcc_personality_v0.c
-  int_util.c
-  lshrdi3.c
-  lshrti3.c
-  moddi3.c
-  modsi3.c
-  modti3.c
-  muldc3.c
-  muldf3.c
-  muldi3.c
-  mulodi4.c
-  mulosi4.c
-  muloti4.c
-  mulsc3.c
-  mulsf3.c
-  multi3.c
-  mulvdi3.c
-  mulvsi3.c
-  mulvti3.c
-  mulxc3.c
-  negdf2.c
-  negdi2.c
-  negsf2.c
-  negti2.c
-  negvdi2.c
-  negvsi2.c
-  negvti2.c
-  paritydi2.c
-  paritysi2.c
-  parityti2.c
-  popcountdi2.c
-  popcountsi2.c
-  popcountti2.c
-  powidf2.c
-  powisf2.c
-  powitf2.c
-  powixf2.c
-  subdf3.c
-  subsf3.c
-  subvdi3.c
-  subvsi3.c
-  subvti3.c
-  trampoline_setup.c
-  truncdfsf2.c
-  ucmpdi2.c
-  ucmpti2.c
-  udivdi3.c
-  udivmoddi4.c
-  udivmodsi4.c
-  udivmodti4.c
-  udivsi3.c
-  udivti3.c
-  umoddi3.c
-  umodsi3.c
-  umodti3.c
-  )
-
-set(x86_64_SOURCES
-  x86_64/floatdidf.c
-  x86_64/floatdisf.c
-  x86_64/floatdixf.c
-  x86_64/floatundidf.S
-  x86_64/floatundisf.S
-  x86_64/floatundixf.S
-  ${GENERIC_SOURCES})
-
-set(i386_SOURCES
-  i386/ashldi3.S
-  i386/ashrdi3.S
-  i386/divdi3.S
-  i386/floatdidf.S
-  i386/floatdisf.S
-  i386/floatdixf.S
-  i386/floatundidf.S
-  i386/floatundisf.S
-  i386/floatundixf.S
-  i386/lshrdi3.S
-  i386/moddi3.S
-  i386/muldi3.S
-  i386/udivdi3.S
-  i386/umoddi3.S
-  ${GENERIC_SOURCES})
-
-set(arm_SOURCES
-  arm/adddf3vfp.S
-  arm/addsf3vfp.S
-  arm/aeabi_dcmp.S
-  arm/aeabi_fcmp.S
-  arm/aeabi_idivmod.S
-  arm/aeabi_ldivmod.S
-  arm/aeabi_memcmp.S
-  arm/aeabi_memcpy.S
-  arm/aeabi_memmove.S
-  arm/aeabi_memset.S
-  arm/aeabi_uidivmod.S
-  arm/aeabi_uldivmod.S
-  arm/bswapdi2.S
-  arm/bswapsi2.S
-  arm/comparesf2.S
-  arm/divdf3vfp.S
-  arm/divmodsi4.S
-  arm/divsf3vfp.S
-  arm/divsi3.S
-  arm/eqdf2vfp.S
-  arm/eqsf2vfp.S
-  arm/extendsfdf2vfp.S
-  arm/fixdfsivfp.S
-  arm/fixsfsivfp.S
-  arm/fixunsdfsivfp.S
-  arm/fixunssfsivfp.S
-  arm/floatsidfvfp.S
-  arm/floatsisfvfp.S
-  arm/floatunssidfvfp.S
-  arm/floatunssisfvfp.S
-  arm/gedf2vfp.S
-  arm/gesf2vfp.S
-  arm/gtdf2vfp.S
-  arm/gtsf2vfp.S
-  arm/ledf2vfp.S
-  arm/lesf2vfp.S
-  arm/ltdf2vfp.S
-  arm/ltsf2vfp.S
-  arm/modsi3.S
-  arm/muldf3vfp.S
-  arm/mulsf3vfp.S
-  arm/nedf2vfp.S
-  arm/negdf2vfp.S
-  arm/negsf2vfp.S
-  arm/nesf2vfp.S
-  arm/restore_vfp_d8_d15_regs.S
-  arm/save_vfp_d8_d15_regs.S
-  arm/subdf3vfp.S
-  arm/subsf3vfp.S
-  arm/switch16.S
-  arm/switch32.S
-  arm/switch8.S
-  arm/switchu8.S
-  arm/sync_synchronize.S
-  arm/truncdfsf2vfp.S
-  arm/udivmodsi4.S
-  arm/udivsi3.S
-  arm/umodsi3.S
-  arm/unorddf2vfp.S
-  arm/unordsf2vfp.S
-  ${GENERIC_SOURCES})
-
-if (NOT WIN32)
-  foreach(arch x86_64 i386 arm)
-    if(CAN_TARGET_${arch})
-      add_compiler_rt_static_runtime(clang_rt.${arch} ${arch}
-        SOURCES ${${arch}_SOURCES}
-        CFLAGS "-std=c99")
-    endif()
-  endforeach()
-endif()
+add_subdirectory(builtins)
 
 # Generate configs for running lit and unit tests.
 configure_lit_site_cfg(
diff --git a/compiler-rt/lib/Makefile.mk b/compiler-rt/lib/Makefile.mk
index f9d7800cc4c..ed9690d467a 100644
--- a/compiler-rt/lib/Makefile.mk
+++ b/compiler-rt/lib/Makefile.mk
@@ -7,27 +7,16 @@
 #
 #===------------------------------------------------------------------------===#
 
-ModuleName := builtins
 SubDirs :=
 
-# Add arch specific optimized implementations.
-SubDirs += i386 ppc x86_64 arm
-
-# Add other submodules.
+# Add submodules.
 SubDirs += asan
+SubDirs += builtins
+SubDirs += dfsan
 SubDirs += interception
+SubDirs += lsan
+SubDirs += msan
 SubDirs += profile
 SubDirs += sanitizer_common
 SubDirs += tsan
-SubDirs += msan
 SubDirs += ubsan
-SubDirs += lsan
-SubDirs += dfsan
-
-# Define the variables for this specific directory.
-Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
-ObjNames := $(Sources:%.c=%.o)
-Implementation := Generic
-
-# FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
new file mode 100644
index 00000000000..81ae21f7d8f
--- /dev/null
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -0,0 +1,233 @@
+# This directory contains a large amount of C code which provides
+# generic implementations of the core runtime library along with optimized
+# architecture-specific code in various subdirectories.
+
+set(GENERIC_SOURCES
+  absvdi2.c
+  absvsi2.c
+  absvti2.c
+  adddf3.c
+  addsf3.c
+  addvdi3.c
+  addvsi3.c
+  addvti3.c
+  apple_versioning.c
+  ashldi3.c
+  ashlti3.c
+  ashrdi3.c
+  ashrti3.c
+  # FIXME: atomic.c may only be compiled if host compiler understands _Atomic
+  # atomic.c
+  clear_cache.c
+  clzdi2.c
+  clzsi2.c
+  clzti2.c
+  cmpdi2.c
+  cmpti2.c
+  comparedf2.c
+  comparesf2.c
+  ctzdi2.c
+  ctzsi2.c
+  ctzti2.c
+  divdc3.c
+  divdf3.c
+  divdi3.c
+  divmoddi4.c
+  divmodsi4.c
+  divsc3.c
+  divsf3.c
+  divsi3.c
+  divti3.c
+  divxc3.c
+  enable_execute_stack.c
+  eprintf.c
+  extendsfdf2.c
+  ffsdi2.c
+  ffsti2.c
+  fixdfdi.c
+  fixdfsi.c
+  fixdfti.c
+  fixsfdi.c
+  fixsfsi.c
+  fixsfti.c
+  fixunsdfdi.c
+  fixunsdfsi.c
+  fixunsdfti.c
+  fixunssfdi.c
+  fixunssfsi.c
+  fixunssfti.c
+  fixunsxfdi.c
+  fixunsxfsi.c
+  fixunsxfti.c
+  fixxfdi.c
+  fixxfti.c
+  floatdidf.c
+  floatdisf.c
+  floatdixf.c
+  floatsidf.c
+  floatsisf.c
+  floattidf.c
+  floattisf.c
+  floattixf.c
+  floatundidf.c
+  floatundisf.c
+  floatundixf.c
+  floatunsidf.c
+  floatunsisf.c
+  floatuntidf.c
+  floatuntisf.c
+  floatuntixf.c
+  gcc_personality_v0.c
+  int_util.c
+  lshrdi3.c
+  lshrti3.c
+  moddi3.c
+  modsi3.c
+  modti3.c
+  muldc3.c
+  muldf3.c
+  muldi3.c
+  mulodi4.c
+  mulosi4.c
+  muloti4.c
+  mulsc3.c
+  mulsf3.c
+  multi3.c
+  mulvdi3.c
+  mulvsi3.c
+  mulvti3.c
+  mulxc3.c
+  negdf2.c
+  negdi2.c
+  negsf2.c
+  negti2.c
+  negvdi2.c
+  negvsi2.c
+  negvti2.c
+  paritydi2.c
+  paritysi2.c
+  parityti2.c
+  popcountdi2.c
+  popcountsi2.c
+  popcountti2.c
+  powidf2.c
+  powisf2.c
+  powitf2.c
+  powixf2.c
+  subdf3.c
+  subsf3.c
+  subvdi3.c
+  subvsi3.c
+  subvti3.c
+  trampoline_setup.c
+  truncdfsf2.c
+  ucmpdi2.c
+  ucmpti2.c
+  udivdi3.c
+  udivmoddi4.c
+  udivmodsi4.c
+  udivmodti4.c
+  udivsi3.c
+  udivti3.c
+  umoddi3.c
+  umodsi3.c
+  umodti3.c)
+
+set(x86_64_SOURCES
+  x86_64/floatdidf.c
+  x86_64/floatdisf.c
+  x86_64/floatdixf.c
+  x86_64/floatundidf.S
+  x86_64/floatundisf.S
+  x86_64/floatundixf.S
+  ${GENERIC_SOURCES})
+
+set(i386_SOURCES
+  i386/ashldi3.S
+  i386/ashrdi3.S
+  i386/divdi3.S
+  i386/floatdidf.S
+  i386/floatdisf.S
+  i386/floatdixf.S
+  i386/floatundidf.S
+  i386/floatundisf.S
+  i386/floatundixf.S
+  i386/lshrdi3.S
+  i386/moddi3.S
+  i386/muldi3.S
+  i386/udivdi3.S
+  i386/umoddi3.S
+  ${GENERIC_SOURCES})
+
+set(arm_SOURCES
+  arm/adddf3vfp.S
+  arm/addsf3vfp.S
+  arm/aeabi_dcmp.S
+  arm/aeabi_fcmp.S
+  arm/aeabi_idivmod.S
+  arm/aeabi_ldivmod.S
+  arm/aeabi_memcmp.S
+  arm/aeabi_memcpy.S
+  arm/aeabi_memmove.S
+  arm/aeabi_memset.S
+  arm/aeabi_uidivmod.S
+  arm/aeabi_uldivmod.S
+  arm/bswapdi2.S
+  arm/bswapsi2.S
+  arm/comparesf2.S
+  arm/divdf3vfp.S
+  arm/divmodsi4.S
+  arm/divsf3vfp.S
+  arm/divsi3.S
+  arm/eqdf2vfp.S
+  arm/eqsf2vfp.S
+  arm/extendsfdf2vfp.S
+  arm/fixdfsivfp.S
+  arm/fixsfsivfp.S
+  arm/fixunsdfsivfp.S
+  arm/fixunssfsivfp.S
+  arm/floatsidfvfp.S
+  arm/floatsisfvfp.S
+  arm/floatunssidfvfp.S
+  arm/floatunssisfvfp.S
+  arm/gedf2vfp.S
+  arm/gesf2vfp.S
+  arm/gtdf2vfp.S
+  arm/gtsf2vfp.S
+  arm/ledf2vfp.S
+  arm/lesf2vfp.S
+  arm/ltdf2vfp.S
+  arm/ltsf2vfp.S
+  arm/modsi3.S
+  arm/muldf3vfp.S
+  arm/mulsf3vfp.S
+  arm/nedf2vfp.S
+  arm/negdf2vfp.S
+  arm/negsf2vfp.S
+  arm/nesf2vfp.S
+  arm/restore_vfp_d8_d15_regs.S
+  arm/save_vfp_d8_d15_regs.S
+  arm/subdf3vfp.S
+  arm/subsf3vfp.S
+  arm/switch16.S
+  arm/switch32.S
+  arm/switch8.S
+  arm/switchu8.S
+  arm/sync_synchronize.S
+  arm/truncdfsf2vfp.S
+  arm/udivmodsi4.S
+  arm/udivsi3.S
+  arm/umodsi3.S
+  arm/unorddf2vfp.S
+  arm/unordsf2vfp.S
+  ${GENERIC_SOURCES})
+
+if (NOT WIN32)
+  foreach(arch x86_64 i386 arm)
+    if(CAN_TARGET_${arch})
+      add_compiler_rt_static_runtime(clang_rt.${arch} ${arch}
+        SOURCES ${${arch}_SOURCES}
+        CFLAGS "-std=c99")
+    endif()
+  endforeach()
+endif()
diff --git a/compiler-rt/lib/builtins/Makefile.mk b/compiler-rt/lib/builtins/Makefile.mk
new file mode 100644
index 00000000000..3143d91f070
--- /dev/null
+++ b/compiler-rt/lib/builtins/Makefile.mk
@@ -0,0 +1,22 @@
+#===- lib/builtins/Makefile.mk -----------------------------*- Makefile -*--===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+#===------------------------------------------------------------------------===#
+
+ModuleName := builtins
+SubDirs :=
+
+# Add arch specific optimized implementations.
+SubDirs += i386 ppc x86_64 arm
+
+# Define the variables for this specific directory.
+Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
+ObjNames := $(Sources:%.c=%.o)
+Implementation := Generic
+
+# FIXME: use automatic dependencies?
+Dependencies := $(wildcard $(Dir)/*.h)
diff --git a/compiler-rt/lib/absvdi2.c b/compiler-rt/lib/builtins/absvdi2.c
index 682c2355d2a..682c2355d2a 100644
--- a/compiler-rt/lib/absvdi2.c
+++ b/compiler-rt/lib/builtins/absvdi2.c
diff --git a/compiler-rt/lib/absvsi2.c b/compiler-rt/lib/builtins/absvsi2.c
index 4812af81598..4812af81598 100644
--- a/compiler-rt/lib/absvsi2.c
+++ b/compiler-rt/lib/builtins/absvsi2.c
diff --git a/compiler-rt/lib/absvti2.c b/compiler-rt/lib/builtins/absvti2.c
index c1c7277986a..c1c7277986a 100644
--- a/compiler-rt/lib/absvti2.c
+++ b/compiler-rt/lib/builtins/absvti2.c
diff --git a/compiler-rt/lib/adddf3.c b/compiler-rt/lib/builtins/adddf3.c
index a55e82d2117..a55e82d2117 100644
--- a/compiler-rt/lib/adddf3.c
+++ b/compiler-rt/lib/builtins/adddf3.c
diff --git a/compiler-rt/lib/addsf3.c b/compiler-rt/lib/builtins/addsf3.c
index 0268324deaa..0268324deaa 100644
--- a/compiler-rt/lib/addsf3.c
+++ b/compiler-rt/lib/builtins/addsf3.c
diff --git a/compiler-rt/lib/addvdi3.c b/compiler-rt/lib/builtins/addvdi3.c
index db45a27f078..db45a27f078 100644
--- a/compiler-rt/lib/addvdi3.c
+++ b/compiler-rt/lib/builtins/addvdi3.c
diff --git a/compiler-rt/lib/addvsi3.c b/compiler-rt/lib/builtins/addvsi3.c
index 81f515cd7bb..81f515cd7bb 100644
--- a/compiler-rt/lib/addvsi3.c
+++ b/compiler-rt/lib/builtins/addvsi3.c
diff --git a/compiler-rt/lib/addvti3.c b/compiler-rt/lib/builtins/addvti3.c
index 2efcf3b408e..2efcf3b408e 100644
--- a/compiler-rt/lib/addvti3.c
+++ b/compiler-rt/lib/builtins/addvti3.c
diff --git a/compiler-rt/lib/apple_versioning.c b/compiler-rt/lib/builtins/apple_versioning.c
index 3797a1ab02d..3797a1ab02d 100644
--- a/compiler-rt/lib/apple_versioning.c
+++ b/compiler-rt/lib/builtins/apple_versioning.c
diff --git a/compiler-rt/lib/arm/Makefile.mk b/compiler-rt/lib/builtins/arm/Makefile.mk
index 4aeb365c971..ed2e8323e39 100644
--- a/compiler-rt/lib/arm/Makefile.mk
+++ b/compiler-rt/lib/builtins/arm/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/arm/Makefile.mk ----------------------------------*- Makefile -*--===#
+#===- lib/builtins/arm/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/compiler-rt/lib/arm/adddf3vfp.S b/compiler-rt/lib/builtins/arm/adddf3vfp.S
index 4302b6ab310..4302b6ab310 100644
--- a/compiler-rt/lib/arm/adddf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/adddf3vfp.S
diff --git a/compiler-rt/lib/arm/addsf3vfp.S b/compiler-rt/lib/builtins/arm/addsf3vfp.S
index 316328abe69..316328abe69 100644
--- a/compiler-rt/lib/arm/addsf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/addsf3vfp.S
diff --git a/compiler-rt/lib/arm/aeabi_dcmp.S b/compiler-rt/lib/builtins/arm/aeabi_dcmp.S
index ee2946d2d55..ee2946d2d55 100644
--- a/compiler-rt/lib/arm/aeabi_dcmp.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_dcmp.S
diff --git a/compiler-rt/lib/arm/aeabi_fcmp.S b/compiler-rt/lib/builtins/arm/aeabi_fcmp.S
index ac3f54721f7..ac3f54721f7 100644
--- a/compiler-rt/lib/arm/aeabi_fcmp.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_fcmp.S
diff --git a/compiler-rt/lib/arm/aeabi_idivmod.S b/compiler-rt/lib/builtins/arm/aeabi_idivmod.S
index ac5dfcc22be..ac5dfcc22be 100644
--- a/compiler-rt/lib/arm/aeabi_idivmod.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_idivmod.S
diff --git a/compiler-rt/lib/arm/aeabi_ldivmod.S b/compiler-rt/lib/builtins/arm/aeabi_ldivmod.S
index 68425257141..68425257141 100644
--- a/compiler-rt/lib/arm/aeabi_ldivmod.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_ldivmod.S
diff --git a/compiler-rt/lib/arm/aeabi_memcmp.S b/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
index fc20825f475..fc20825f475 100644
--- a/compiler-rt/lib/arm/aeabi_memcmp.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
diff --git a/compiler-rt/lib/arm/aeabi_memcpy.S b/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
index f6184632ed9..f6184632ed9 100644
--- a/compiler-rt/lib/arm/aeabi_memcpy.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
diff --git a/compiler-rt/lib/arm/aeabi_memmove.S b/compiler-rt/lib/builtins/arm/aeabi_memmove.S
index f3d6b0e1ab8..f3d6b0e1ab8 100644
--- a/compiler-rt/lib/arm/aeabi_memmove.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_memmove.S
diff --git a/compiler-rt/lib/arm/aeabi_memset.S b/compiler-rt/lib/builtins/arm/aeabi_memset.S
index 43c085e2665..43c085e2665 100644
--- a/compiler-rt/lib/arm/aeabi_memset.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_memset.S
diff --git a/compiler-rt/lib/arm/aeabi_uidivmod.S b/compiler-rt/lib/builtins/arm/aeabi_uidivmod.S
index 4c1e818cb3d..4c1e818cb3d 100644
--- a/compiler-rt/lib/arm/aeabi_uidivmod.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_uidivmod.S
diff --git a/compiler-rt/lib/arm/aeabi_uldivmod.S b/compiler-rt/lib/builtins/arm/aeabi_uldivmod.S
index 62a2113cc2b..62a2113cc2b 100644
--- a/compiler-rt/lib/arm/aeabi_uldivmod.S
+++ b/compiler-rt/lib/builtins/arm/aeabi_uldivmod.S
diff --git a/compiler-rt/lib/arm/bswapdi2.S b/compiler-rt/lib/builtins/arm/bswapdi2.S
index c6e1b79c608..c6e1b79c608 100644
--- a/compiler-rt/lib/arm/bswapdi2.S
+++ b/compiler-rt/lib/builtins/arm/bswapdi2.S
diff --git a/compiler-rt/lib/arm/bswapsi2.S b/compiler-rt/lib/builtins/arm/bswapsi2.S
index 5842da263d2..5842da263d2 100644
--- a/compiler-rt/lib/arm/bswapsi2.S
+++ b/compiler-rt/lib/builtins/arm/bswapsi2.S
diff --git a/compiler-rt/lib/arm/clzdi2.S b/compiler-rt/lib/builtins/arm/clzdi2.S
index 33284cd3af2..33284cd3af2 100644
--- a/compiler-rt/lib/arm/clzdi2.S
+++ b/compiler-rt/lib/builtins/arm/clzdi2.S
diff --git a/compiler-rt/lib/arm/clzsi2.S b/compiler-rt/lib/builtins/arm/clzsi2.S
index 8081d3284b8..8081d3284b8 100644
--- a/compiler-rt/lib/arm/clzsi2.S
+++ b/compiler-rt/lib/builtins/arm/clzsi2.S
diff --git a/compiler-rt/lib/arm/comparesf2.S b/compiler-rt/lib/builtins/arm/comparesf2.S
index ad1b10a7fd3..ad1b10a7fd3 100644
--- a/compiler-rt/lib/arm/comparesf2.S
+++ b/compiler-rt/lib/builtins/arm/comparesf2.S
diff --git a/compiler-rt/lib/arm/divdf3vfp.S b/compiler-rt/lib/builtins/arm/divdf3vfp.S
index ec2f9972124..ec2f9972124 100644
--- a/compiler-rt/lib/arm/divdf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/divdf3vfp.S
diff --git a/compiler-rt/lib/arm/divmodsi4.S b/compiler-rt/lib/builtins/arm/divmodsi4.S
index 24e3657dd38..24e3657dd38 100644
--- a/compiler-rt/lib/arm/divmodsi4.S
+++ b/compiler-rt/lib/builtins/arm/divmodsi4.S
diff --git a/compiler-rt/lib/arm/divsf3vfp.S b/compiler-rt/lib/builtins/arm/divsf3vfp.S
index a4e2f814867..a4e2f814867 100644
--- a/compiler-rt/lib/arm/divsf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/divsf3vfp.S
diff --git a/compiler-rt/lib/arm/divsi3.S b/compiler-rt/lib/builtins/arm/divsi3.S
index 76b67935265..76b67935265 100644
--- a/compiler-rt/lib/arm/divsi3.S
+++ b/compiler-rt/lib/builtins/arm/divsi3.S
diff --git a/compiler-rt/lib/arm/eqdf2vfp.S b/compiler-rt/lib/builtins/arm/eqdf2vfp.S
index 198d42278e0..198d42278e0 100644
--- a/compiler-rt/lib/arm/eqdf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/eqdf2vfp.S
diff --git a/compiler-rt/lib/arm/eqsf2vfp.S b/compiler-rt/lib/builtins/arm/eqsf2vfp.S
index 395187f47bf..395187f47bf 100644
--- a/compiler-rt/lib/arm/eqsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/eqsf2vfp.S
diff --git a/compiler-rt/lib/arm/extendsfdf2vfp.S b/compiler-rt/lib/builtins/arm/extendsfdf2vfp.S
index ba31f3e0c5b..ba31f3e0c5b 100644
--- a/compiler-rt/lib/arm/extendsfdf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/extendsfdf2vfp.S
diff --git a/compiler-rt/lib/arm/fixdfsivfp.S b/compiler-rt/lib/builtins/arm/fixdfsivfp.S
index 26adbe3899b..26adbe3899b 100644
--- a/compiler-rt/lib/arm/fixdfsivfp.S
+++ b/compiler-rt/lib/builtins/arm/fixdfsivfp.S
diff --git a/compiler-rt/lib/arm/fixsfsivfp.S b/compiler-rt/lib/builtins/arm/fixsfsivfp.S
index c1e0dadb7b3..c1e0dadb7b3 100644
--- a/compiler-rt/lib/arm/fixsfsivfp.S
+++ b/compiler-rt/lib/builtins/arm/fixsfsivfp.S
diff --git a/compiler-rt/lib/arm/fixunsdfsivfp.S b/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S
index fb91da752e3..fb91da752e3 100644
--- a/compiler-rt/lib/arm/fixunsdfsivfp.S
+++ b/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S
diff --git a/compiler-rt/lib/arm/fixunssfsivfp.S b/compiler-rt/lib/builtins/arm/fixunssfsivfp.S
index f12dff61af5..f12dff61af5 100644
--- a/compiler-rt/lib/arm/fixunssfsivfp.S
+++ b/compiler-rt/lib/builtins/arm/fixunssfsivfp.S
diff --git a/compiler-rt/lib/arm/floatsidfvfp.S b/compiler-rt/lib/builtins/arm/floatsidfvfp.S
index ab48933b971..ab48933b971 100644
--- a/compiler-rt/lib/arm/floatsidfvfp.S
+++ b/compiler-rt/lib/builtins/arm/floatsidfvfp.S
diff --git a/compiler-rt/lib/arm/floatsisfvfp.S b/compiler-rt/lib/builtins/arm/floatsisfvfp.S
index eb265e99025..eb265e99025 100644
--- a/compiler-rt/lib/arm/floatsisfvfp.S
+++ b/compiler-rt/lib/builtins/arm/floatsisfvfp.S
diff --git a/compiler-rt/lib/arm/floatunssidfvfp.S b/compiler-rt/lib/builtins/arm/floatunssidfvfp.S
index 96e2eb21e49..96e2eb21e49 100644
--- a/compiler-rt/lib/arm/floatunssidfvfp.S
+++ b/compiler-rt/lib/builtins/arm/floatunssidfvfp.S
diff --git a/compiler-rt/lib/arm/floatunssisfvfp.S b/compiler-rt/lib/builtins/arm/floatunssisfvfp.S
index 05471c4a5ff..05471c4a5ff 100644
--- a/compiler-rt/lib/arm/floatunssisfvfp.S
+++ b/compiler-rt/lib/builtins/arm/floatunssisfvfp.S
diff --git a/compiler-rt/lib/arm/gedf2vfp.S b/compiler-rt/lib/builtins/arm/gedf2vfp.S
index aa636aa1429..aa636aa1429 100644
--- a/compiler-rt/lib/arm/gedf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/gedf2vfp.S
diff --git a/compiler-rt/lib/arm/gesf2vfp.S b/compiler-rt/lib/builtins/arm/gesf2vfp.S
index 087ce15f1b0..087ce15f1b0 100644
--- a/compiler-rt/lib/arm/gesf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/gesf2vfp.S
diff --git a/compiler-rt/lib/arm/gtdf2vfp.S b/compiler-rt/lib/builtins/arm/gtdf2vfp.S
index 230952a9f65..230952a9f65 100644
--- a/compiler-rt/lib/arm/gtdf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/gtdf2vfp.S
diff --git a/compiler-rt/lib/arm/gtsf2vfp.S b/compiler-rt/lib/builtins/arm/gtsf2vfp.S
index c1f5db05325..c1f5db05325 100644
--- a/compiler-rt/lib/arm/gtsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/gtsf2vfp.S
diff --git a/compiler-rt/lib/arm/ledf2vfp.S b/compiler-rt/lib/builtins/arm/ledf2vfp.S
index 94980a2efd2..94980a2efd2 100644
--- a/compiler-rt/lib/arm/ledf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/ledf2vfp.S
diff --git a/compiler-rt/lib/arm/lesf2vfp.S b/compiler-rt/lib/builtins/arm/lesf2vfp.S
index 362352a83aa..362352a83aa 100644
--- a/compiler-rt/lib/arm/lesf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/lesf2vfp.S
diff --git a/compiler-rt/lib/arm/ltdf2vfp.S b/compiler-rt/lib/builtins/arm/ltdf2vfp.S
index 391ff2924f0..391ff2924f0 100644
--- a/compiler-rt/lib/arm/ltdf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/ltdf2vfp.S
diff --git a/compiler-rt/lib/arm/ltsf2vfp.S b/compiler-rt/lib/builtins/arm/ltsf2vfp.S
index dcaa03561ff..dcaa03561ff 100644
--- a/compiler-rt/lib/arm/ltsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/ltsf2vfp.S
diff --git a/compiler-rt/lib/arm/modsi3.S b/compiler-rt/lib/builtins/arm/modsi3.S
index 07c5f9381ec..07c5f9381ec 100644
--- a/compiler-rt/lib/arm/modsi3.S
+++ b/compiler-rt/lib/builtins/arm/modsi3.S
diff --git a/compiler-rt/lib/arm/muldf3vfp.S b/compiler-rt/lib/builtins/arm/muldf3vfp.S
index 2c1d7037728..2c1d7037728 100644
--- a/compiler-rt/lib/arm/muldf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/muldf3vfp.S
diff --git a/compiler-rt/lib/arm/mulsf3vfp.S b/compiler-rt/lib/builtins/arm/mulsf3vfp.S
index 98af81d2364..98af81d2364 100644
--- a/compiler-rt/lib/arm/mulsf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/mulsf3vfp.S
diff --git a/compiler-rt/lib/arm/nedf2vfp.S b/compiler-rt/lib/builtins/arm/nedf2vfp.S
index c1a832e1a61..c1a832e1a61 100644
--- a/compiler-rt/lib/arm/nedf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/nedf2vfp.S
diff --git a/compiler-rt/lib/arm/negdf2vfp.S b/compiler-rt/lib/builtins/arm/negdf2vfp.S
index ad9b8741807..ad9b8741807 100644
--- a/compiler-rt/lib/arm/negdf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/negdf2vfp.S
diff --git a/compiler-rt/lib/arm/negsf2vfp.S b/compiler-rt/lib/builtins/arm/negsf2vfp.S
index 482eb264070..482eb264070 100644
--- a/compiler-rt/lib/arm/negsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/negsf2vfp.S
diff --git a/compiler-rt/lib/arm/nesf2vfp.S b/compiler-rt/lib/builtins/arm/nesf2vfp.S
index 127145ec42e..127145ec42e 100644
--- a/compiler-rt/lib/arm/nesf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/nesf2vfp.S
diff --git a/compiler-rt/lib/arm/restore_vfp_d8_d15_regs.S b/compiler-rt/lib/builtins/arm/restore_vfp_d8_d15_regs.S
index 5d55474158a..5d55474158a 100644
--- a/compiler-rt/lib/arm/restore_vfp_d8_d15_regs.S
+++ b/compiler-rt/lib/builtins/arm/restore_vfp_d8_d15_regs.S
diff --git a/compiler-rt/lib/arm/save_vfp_d8_d15_regs.S b/compiler-rt/lib/builtins/arm/save_vfp_d8_d15_regs.S
index 4be3ff3a525..4be3ff3a525 100644
--- a/compiler-rt/lib/arm/save_vfp_d8_d15_regs.S
+++ b/compiler-rt/lib/builtins/arm/save_vfp_d8_d15_regs.S
diff --git a/compiler-rt/lib/arm/softfloat-alias.list b/compiler-rt/lib/builtins/arm/softfloat-alias.list
index cc6a4b3cdd2..cc6a4b3cdd2 100644
--- a/compiler-rt/lib/arm/softfloat-alias.list
+++ b/compiler-rt/lib/builtins/arm/softfloat-alias.list
diff --git a/compiler-rt/lib/arm/subdf3vfp.S b/compiler-rt/lib/builtins/arm/subdf3vfp.S
index 747d6596cdd..747d6596cdd 100644
--- a/compiler-rt/lib/arm/subdf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/subdf3vfp.S
diff --git a/compiler-rt/lib/arm/subsf3vfp.S b/compiler-rt/lib/builtins/arm/subsf3vfp.S
index 7cc63cccc31..7cc63cccc31 100644
--- a/compiler-rt/lib/arm/subsf3vfp.S
+++ b/compiler-rt/lib/builtins/arm/subsf3vfp.S
diff --git a/compiler-rt/lib/arm/switch16.S b/compiler-rt/lib/builtins/arm/switch16.S
index 0dedc598a13..0dedc598a13 100644
--- a/compiler-rt/lib/arm/switch16.S
+++ b/compiler-rt/lib/builtins/arm/switch16.S
diff --git a/compiler-rt/lib/arm/switch32.S b/compiler-rt/lib/builtins/arm/switch32.S
index 64d558eb8fa..64d558eb8fa 100644
--- a/compiler-rt/lib/arm/switch32.S
+++ b/compiler-rt/lib/builtins/arm/switch32.S
diff --git a/compiler-rt/lib/arm/switch8.S b/compiler-rt/lib/builtins/arm/switch8.S
index b5008849a30..b5008849a30 100644
--- a/compiler-rt/lib/arm/switch8.S
+++ b/compiler-rt/lib/builtins/arm/switch8.S
diff --git a/compiler-rt/lib/arm/switchu8.S b/compiler-rt/lib/builtins/arm/switchu8.S
index 488d4e74eed..488d4e74eed 100644
--- a/compiler-rt/lib/arm/switchu8.S
+++ b/compiler-rt/lib/builtins/arm/switchu8.S
diff --git a/compiler-rt/lib/arm/sync_synchronize.S b/compiler-rt/lib/builtins/arm/sync_synchronize.S
index aa18f04fb5f..aa18f04fb5f 100644
--- a/compiler-rt/lib/arm/sync_synchronize.S
+++ b/compiler-rt/lib/builtins/arm/sync_synchronize.S
diff --git a/compiler-rt/lib/arm/truncdfsf2vfp.S b/compiler-rt/lib/builtins/arm/truncdfsf2vfp.S
index 55bf324ccc4..55bf324ccc4 100644
--- a/compiler-rt/lib/arm/truncdfsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/truncdfsf2vfp.S
diff --git a/compiler-rt/lib/arm/udivmodsi4.S b/compiler-rt/lib/builtins/arm/udivmodsi4.S
index bb5d29c03e6..bb5d29c03e6 100644
--- a/compiler-rt/lib/arm/udivmodsi4.S
+++ b/compiler-rt/lib/builtins/arm/udivmodsi4.S
diff --git a/compiler-rt/lib/arm/udivsi3.S b/compiler-rt/lib/builtins/arm/udivsi3.S
index 11c1c096ec1..11c1c096ec1 100644
--- a/compiler-rt/lib/arm/udivsi3.S
+++ b/compiler-rt/lib/builtins/arm/udivsi3.S
diff --git a/compiler-rt/lib/arm/umodsi3.S b/compiler-rt/lib/builtins/arm/umodsi3.S
index a03afefdaa2..a03afefdaa2 100644
--- a/compiler-rt/lib/arm/umodsi3.S
+++ b/compiler-rt/lib/builtins/arm/umodsi3.S
diff --git a/compiler-rt/lib/arm/unorddf2vfp.S b/compiler-rt/lib/builtins/arm/unorddf2vfp.S
index ee7de402531..ee7de402531 100644
--- a/compiler-rt/lib/arm/unorddf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/unorddf2vfp.S
diff --git a/compiler-rt/lib/arm/unordsf2vfp.S b/compiler-rt/lib/builtins/arm/unordsf2vfp.S
index eb419a54154..eb419a54154 100644
--- a/compiler-rt/lib/arm/unordsf2vfp.S
+++ b/compiler-rt/lib/builtins/arm/unordsf2vfp.S
diff --git a/compiler-rt/lib/ashldi3.c b/compiler-rt/lib/builtins/ashldi3.c
index eb4698ac517..eb4698ac517 100644
--- a/compiler-rt/lib/ashldi3.c
+++ b/compiler-rt/lib/builtins/ashldi3.c
diff --git a/compiler-rt/lib/ashlti3.c b/compiler-rt/lib/builtins/ashlti3.c
index 4bd8219b527..4bd8219b527 100644
--- a/compiler-rt/lib/ashlti3.c
+++ b/compiler-rt/lib/builtins/ashlti3.c
diff --git a/compiler-rt/lib/ashrdi3.c b/compiler-rt/lib/builtins/ashrdi3.c
index 14c878bb779..14c878bb779 100644
--- a/compiler-rt/lib/ashrdi3.c
+++ b/compiler-rt/lib/builtins/ashrdi3.c
diff --git a/compiler-rt/lib/ashrti3.c b/compiler-rt/lib/builtins/ashrti3.c
index ed43641c7ef..ed43641c7ef 100644
--- a/compiler-rt/lib/ashrti3.c
+++ b/compiler-rt/lib/builtins/ashrti3.c
diff --git a/compiler-rt/lib/assembly.h b/compiler-rt/lib/builtins/assembly.h
index 1a9f79cb632..1a9f79cb632 100644
--- a/compiler-rt/lib/assembly.h
+++ b/compiler-rt/lib/builtins/assembly.h
diff --git a/compiler-rt/lib/atomic.c b/compiler-rt/lib/builtins/atomic.c
index 02429a653d2..02429a653d2 100644
--- a/compiler-rt/lib/atomic.c
+++ b/compiler-rt/lib/builtins/atomic.c
diff --git a/compiler-rt/lib/clear_cache.c b/compiler-rt/lib/builtins/clear_cache.c
index 7aee28590df..7aee28590df 100644
--- a/compiler-rt/lib/clear_cache.c
+++ b/compiler-rt/lib/builtins/clear_cache.c
diff --git a/compiler-rt/lib/clzdi2.c b/compiler-rt/lib/builtins/clzdi2.c
index b9e64da492b..b9e64da492b 100644
--- a/compiler-rt/lib/clzdi2.c
+++ b/compiler-rt/lib/builtins/clzdi2.c
diff --git a/compiler-rt/lib/clzsi2.c b/compiler-rt/lib/builtins/clzsi2.c
index 25b8ed2c4c2..25b8ed2c4c2 100644
--- a/compiler-rt/lib/clzsi2.c
+++ b/compiler-rt/lib/builtins/clzsi2.c
diff --git a/compiler-rt/lib/clzti2.c b/compiler-rt/lib/builtins/clzti2.c
index 355c20e4239..355c20e4239 100644
--- a/compiler-rt/lib/clzti2.c
+++ b/compiler-rt/lib/builtins/clzti2.c
diff --git a/compiler-rt/lib/cmpdi2.c b/compiler-rt/lib/builtins/cmpdi2.c
index 52634d9c336..52634d9c336 100644
--- a/compiler-rt/lib/cmpdi2.c
+++ b/compiler-rt/lib/builtins/cmpdi2.c
diff --git a/compiler-rt/lib/cmpti2.c b/compiler-rt/lib/builtins/cmpti2.c
index d0aec452a46..d0aec452a46 100644
--- a/compiler-rt/lib/cmpti2.c
+++ b/compiler-rt/lib/builtins/cmpti2.c
diff --git a/compiler-rt/lib/comparedf2.c b/compiler-rt/lib/builtins/comparedf2.c
index de67784dc85..de67784dc85 100644
--- a/compiler-rt/lib/comparedf2.c
+++ b/compiler-rt/lib/builtins/comparedf2.c
diff --git a/compiler-rt/lib/comparesf2.c b/compiler-rt/lib/builtins/comparesf2.c
index c1c3a479c8e..c1c3a479c8e 100644
--- a/compiler-rt/lib/comparesf2.c
+++ b/compiler-rt/lib/builtins/comparesf2.c
diff --git a/compiler-rt/lib/ctzdi2.c b/compiler-rt/lib/builtins/ctzdi2.c
index db3c6fdc08f..db3c6fdc08f 100644
--- a/compiler-rt/lib/ctzdi2.c
+++ b/compiler-rt/lib/builtins/ctzdi2.c
diff --git a/compiler-rt/lib/ctzsi2.c b/compiler-rt/lib/builtins/ctzsi2.c
index c69486ea445..c69486ea445 100644
--- a/compiler-rt/lib/ctzsi2.c
+++ b/compiler-rt/lib/builtins/ctzsi2.c
diff --git a/compiler-rt/lib/ctzti2.c b/compiler-rt/lib/builtins/ctzti2.c
index 66dc01b7ad3..66dc01b7ad3 100644
--- a/compiler-rt/lib/ctzti2.c
+++ b/compiler-rt/lib/builtins/ctzti2.c
diff --git a/compiler-rt/lib/divdc3.c b/compiler-rt/lib/builtins/divdc3.c
index cfbc498e7b4..cfbc498e7b4 100644
--- a/compiler-rt/lib/divdc3.c
+++ b/compiler-rt/lib/builtins/divdc3.c
diff --git a/compiler-rt/lib/divdf3.c b/compiler-rt/lib/builtins/divdf3.c
index efce6bb4bed..efce6bb4bed 100644
--- a/compiler-rt/lib/divdf3.c
+++ b/compiler-rt/lib/builtins/divdf3.c
diff --git a/compiler-rt/lib/divdi3.c b/compiler-rt/lib/builtins/divdi3.c
index 2c2bcc26d58..2c2bcc26d58 100644
--- a/compiler-rt/lib/divdi3.c
+++ b/compiler-rt/lib/builtins/divdi3.c
diff --git a/compiler-rt/lib/divmoddi4.c b/compiler-rt/lib/builtins/divmoddi4.c
index 2fe2b48183f..2fe2b48183f 100644
--- a/compiler-rt/lib/divmoddi4.c
+++ b/compiler-rt/lib/builtins/divmoddi4.c
diff --git a/compiler-rt/lib/divmodsi4.c b/compiler-rt/lib/builtins/divmodsi4.c
index c7f7b1a7c32..c7f7b1a7c32 100644
--- a/compiler-rt/lib/divmodsi4.c
+++ b/compiler-rt/lib/builtins/divmodsi4.c
diff --git a/compiler-rt/lib/divsc3.c b/compiler-rt/lib/builtins/divsc3.c
index caa0c4075eb..caa0c4075eb 100644
--- a/compiler-rt/lib/divsc3.c
+++ b/compiler-rt/lib/builtins/divsc3.c
diff --git a/compiler-rt/lib/divsf3.c b/compiler-rt/lib/builtins/divsf3.c
index c91c648fa24..c91c648fa24 100644
--- a/compiler-rt/lib/divsf3.c
+++ b/compiler-rt/lib/builtins/divsf3.c
diff --git a/compiler-rt/lib/divsi3.c b/compiler-rt/lib/builtins/divsi3.c
index cd19de9525c..cd19de9525c 100644
--- a/compiler-rt/lib/divsi3.c
+++ b/compiler-rt/lib/builtins/divsi3.c
diff --git a/compiler-rt/lib/divti3.c b/compiler-rt/lib/builtins/divti3.c
index 0242c13683f..0242c13683f 100644
--- a/compiler-rt/lib/divti3.c
+++ b/compiler-rt/lib/builtins/divti3.c
diff --git a/compiler-rt/lib/divxc3.c b/compiler-rt/lib/builtins/divxc3.c
index 5f240e956d8..5f240e956d8 100644
--- a/compiler-rt/lib/divxc3.c
+++ b/compiler-rt/lib/builtins/divxc3.c
diff --git a/compiler-rt/lib/enable_execute_stack.c b/compiler-rt/lib/builtins/enable_execute_stack.c
index 278ca246f53..278ca246f53 100644
--- a/compiler-rt/lib/enable_execute_stack.c
+++ b/compiler-rt/lib/builtins/enable_execute_stack.c
diff --git a/compiler-rt/lib/eprintf.c b/compiler-rt/lib/builtins/eprintf.c
index 3626dbf8b0c..3626dbf8b0c 100644
--- a/compiler-rt/lib/eprintf.c
+++ b/compiler-rt/lib/builtins/eprintf.c
diff --git a/compiler-rt/lib/extendsfdf2.c b/compiler-rt/lib/builtins/extendsfdf2.c
index 91fd2b436a3..91fd2b436a3 100644
--- a/compiler-rt/lib/extendsfdf2.c
+++ b/compiler-rt/lib/builtins/extendsfdf2.c
diff --git a/compiler-rt/lib/ffsdi2.c b/compiler-rt/lib/builtins/ffsdi2.c
index a5ac9900ff1..a5ac9900ff1 100644
--- a/compiler-rt/lib/ffsdi2.c
+++ b/compiler-rt/lib/builtins/ffsdi2.c
diff --git a/compiler-rt/lib/ffsti2.c b/compiler-rt/lib/builtins/ffsti2.c
index 27e15d5810e..27e15d5810e 100644
--- a/compiler-rt/lib/ffsti2.c
+++ b/compiler-rt/lib/builtins/ffsti2.c
diff --git a/compiler-rt/lib/fixdfdi.c b/compiler-rt/lib/builtins/fixdfdi.c
index 7665ea5a362..7665ea5a362 100644
--- a/compiler-rt/lib/fixdfdi.c
+++ b/compiler-rt/lib/builtins/fixdfdi.c
diff --git a/compiler-rt/lib/fixdfsi.c b/compiler-rt/lib/builtins/fixdfsi.c
index 614d032a4e1..614d032a4e1 100644
--- a/compiler-rt/lib/fixdfsi.c
+++ b/compiler-rt/lib/builtins/fixdfsi.c
diff --git a/compiler-rt/lib/fixdfti.c b/compiler-rt/lib/builtins/fixdfti.c
index b110a94b842..b110a94b842 100644
--- a/compiler-rt/lib/fixdfti.c
+++ b/compiler-rt/lib/builtins/fixdfti.c
diff --git a/compiler-rt/lib/fixsfdi.c b/compiler-rt/lib/builtins/fixsfdi.c
index 4f6cfdd7a5c..4f6cfdd7a5c 100644
--- a/compiler-rt/lib/fixsfdi.c
+++ b/compiler-rt/lib/builtins/fixsfdi.c
diff --git a/compiler-rt/lib/fixsfsi.c b/compiler-rt/lib/builtins/fixsfsi.c
index e3cc42d5255..e3cc42d5255 100644
--- a/compiler-rt/lib/fixsfsi.c
+++ b/compiler-rt/lib/builtins/fixsfsi.c
diff --git a/compiler-rt/lib/fixsfti.c b/compiler-rt/lib/builtins/fixsfti.c
index c730ae0467c..c730ae0467c 100644
--- a/compiler-rt/lib/fixsfti.c
+++ b/compiler-rt/lib/builtins/fixsfti.c
diff --git a/compiler-rt/lib/fixunsdfdi.c b/compiler-rt/lib/builtins/fixunsdfdi.c
index 9e6371390d5..9e6371390d5 100644
--- a/compiler-rt/lib/fixunsdfdi.c
+++ b/compiler-rt/lib/builtins/fixunsdfdi.c
diff --git a/compiler-rt/lib/fixunsdfsi.c b/compiler-rt/lib/builtins/fixunsdfsi.c
index c6a3c755e90..c6a3c755e90 100644
--- a/compiler-rt/lib/fixunsdfsi.c
+++ b/compiler-rt/lib/builtins/fixunsdfsi.c
diff --git a/compiler-rt/lib/fixunsdfti.c b/compiler-rt/lib/builtins/fixunsdfti.c
index fb0336f6908..fb0336f6908 100644
--- a/compiler-rt/lib/fixunsdfti.c
+++ b/compiler-rt/lib/builtins/fixunsdfti.c
diff --git a/compiler-rt/lib/fixunssfdi.c b/compiler-rt/lib/builtins/fixunssfdi.c
index 69d5952e960..69d5952e960 100644
--- a/compiler-rt/lib/fixunssfdi.c
+++ b/compiler-rt/lib/builtins/fixunssfdi.c
diff --git a/compiler-rt/lib/fixunssfsi.c b/compiler-rt/lib/builtins/fixunssfsi.c
index e034139ea27..e034139ea27 100644
--- a/compiler-rt/lib/fixunssfsi.c
+++ b/compiler-rt/lib/builtins/fixunssfsi.c
diff --git a/compiler-rt/lib/fixunssfti.c b/compiler-rt/lib/builtins/fixunssfti.c
index 8f4c62627ca..8f4c62627ca 100644
--- a/compiler-rt/lib/fixunssfti.c
+++ b/compiler-rt/lib/builtins/fixunssfti.c
diff --git a/compiler-rt/lib/fixunsxfdi.c b/compiler-rt/lib/builtins/fixunsxfdi.c
index 6c817d8e128..6c817d8e128 100644
--- a/compiler-rt/lib/fixunsxfdi.c
+++ b/compiler-rt/lib/builtins/fixunsxfdi.c
diff --git a/compiler-rt/lib/fixunsxfsi.c b/compiler-rt/lib/builtins/fixunsxfsi.c
index b9da86c4f8e..b9da86c4f8e 100644
--- a/compiler-rt/lib/fixunsxfsi.c
+++ b/compiler-rt/lib/builtins/fixunsxfsi.c
diff --git a/compiler-rt/lib/fixunsxfti.c b/compiler-rt/lib/builtins/fixunsxfti.c
index 260bfc01f64..260bfc01f64 100644
--- a/compiler-rt/lib/fixunsxfti.c
+++ b/compiler-rt/lib/builtins/fixunsxfti.c
diff --git a/compiler-rt/lib/fixxfdi.c b/compiler-rt/lib/builtins/fixxfdi.c
index 9592ce43025..9592ce43025 100644
--- a/compiler-rt/lib/fixxfdi.c
+++ b/compiler-rt/lib/builtins/fixxfdi.c
diff --git a/compiler-rt/lib/fixxfti.c b/compiler-rt/lib/builtins/fixxfti.c
index 973dc31bf93..973dc31bf93 100644
--- a/compiler-rt/lib/fixxfti.c
+++ b/compiler-rt/lib/builtins/fixxfti.c
diff --git a/compiler-rt/lib/floatdidf.c b/compiler-rt/lib/builtins/floatdidf.c
index e53fa2580f6..e53fa2580f6 100644
--- a/compiler-rt/lib/floatdidf.c
+++ b/compiler-rt/lib/builtins/floatdidf.c
diff --git a/compiler-rt/lib/floatdisf.c b/compiler-rt/lib/builtins/floatdisf.c
index 3e47580ef57..3e47580ef57 100644
--- a/compiler-rt/lib/floatdisf.c
+++ b/compiler-rt/lib/builtins/floatdisf.c
diff --git a/compiler-rt/lib/floatdixf.c b/compiler-rt/lib/builtins/floatdixf.c
index ebf62dba058..ebf62dba058 100644
--- a/compiler-rt/lib/floatdixf.c
+++ b/compiler-rt/lib/builtins/floatdixf.c
diff --git a/compiler-rt/lib/floatsidf.c b/compiler-rt/lib/builtins/floatsidf.c
index 18f378f2a90..18f378f2a90 100644
--- a/compiler-rt/lib/floatsidf.c
+++ b/compiler-rt/lib/builtins/floatsidf.c
diff --git a/compiler-rt/lib/floatsisf.c b/compiler-rt/lib/builtins/floatsisf.c
index 83983934f59..83983934f59 100644
--- a/compiler-rt/lib/floatsisf.c
+++ b/compiler-rt/lib/builtins/floatsisf.c
diff --git a/compiler-rt/lib/floattidf.c b/compiler-rt/lib/builtins/floattidf.c
index 77749f8d340..77749f8d340 100644
--- a/compiler-rt/lib/floattidf.c
+++ b/compiler-rt/lib/builtins/floattidf.c
diff --git a/compiler-rt/lib/floattisf.c b/compiler-rt/lib/builtins/floattisf.c
index 4776125ded7..4776125ded7 100644
--- a/compiler-rt/lib/floattisf.c
+++ b/compiler-rt/lib/builtins/floattisf.c
diff --git a/compiler-rt/lib/floattixf.c b/compiler-rt/lib/builtins/floattixf.c
index 3813dc6b775..3813dc6b775 100644
--- a/compiler-rt/lib/floattixf.c
+++ b/compiler-rt/lib/builtins/floattixf.c
diff --git a/compiler-rt/lib/floatundidf.c b/compiler-rt/lib/builtins/floatundidf.c
index e52fa0a3359..e52fa0a3359 100644
--- a/compiler-rt/lib/floatundidf.c
+++ b/compiler-rt/lib/builtins/floatundidf.c
diff --git a/compiler-rt/lib/floatundisf.c b/compiler-rt/lib/builtins/floatundisf.c
index 713a44abc8b..713a44abc8b 100644
--- a/compiler-rt/lib/floatundisf.c
+++ b/compiler-rt/lib/builtins/floatundisf.c
diff --git a/compiler-rt/lib/floatundixf.c b/compiler-rt/lib/builtins/floatundixf.c
index 64f7662d952..64f7662d952 100644
--- a/compiler-rt/lib/floatundixf.c
+++ b/compiler-rt/lib/builtins/floatundixf.c
diff --git a/compiler-rt/lib/floatunsidf.c b/compiler-rt/lib/builtins/floatunsidf.c
index ba6c2cfd2a1..ba6c2cfd2a1 100644
--- a/compiler-rt/lib/floatunsidf.c
+++ b/compiler-rt/lib/builtins/floatunsidf.c
diff --git a/compiler-rt/lib/floatunsisf.c b/compiler-rt/lib/builtins/floatunsisf.c
index e392c0ecf11..e392c0ecf11 100644
--- a/compiler-rt/lib/floatunsisf.c
+++ b/compiler-rt/lib/builtins/floatunsisf.c
diff --git a/compiler-rt/lib/floatuntidf.c b/compiler-rt/lib/builtins/floatuntidf.c
index 4c1d3289f51..4c1d3289f51 100644
--- a/compiler-rt/lib/floatuntidf.c
+++ b/compiler-rt/lib/builtins/floatuntidf.c
diff --git a/compiler-rt/lib/floatuntisf.c b/compiler-rt/lib/builtins/floatuntisf.c
index c8da2601ba8..c8da2601ba8 100644
--- a/compiler-rt/lib/floatuntisf.c
+++ b/compiler-rt/lib/builtins/floatuntisf.c
diff --git a/compiler-rt/lib/floatuntixf.c b/compiler-rt/lib/builtins/floatuntixf.c
index dbce80f16ee..dbce80f16ee 100644
--- a/compiler-rt/lib/floatuntixf.c
+++ b/compiler-rt/lib/builtins/floatuntixf.c
diff --git a/compiler-rt/lib/fp_lib.h b/compiler-rt/lib/builtins/fp_lib.h
index 661119ae412..661119ae412 100644
--- a/compiler-rt/lib/fp_lib.h
+++ b/compiler-rt/lib/builtins/fp_lib.h
diff --git a/compiler-rt/lib/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c
index 8a708cae597..8a708cae597 100644
--- a/compiler-rt/lib/gcc_personality_v0.c
+++ b/compiler-rt/lib/builtins/gcc_personality_v0.c
diff --git a/compiler-rt/lib/i386/Makefile.mk b/compiler-rt/lib/builtins/i386/Makefile.mk
index 1f5c680c08f..f3776a02c0d 100644
--- a/compiler-rt/lib/i386/Makefile.mk
+++ b/compiler-rt/lib/builtins/i386/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/i386/Makefile.mk ---------------------------------*- Makefile -*--===#
+#===- lib/builtins/i386/Makefile.mk ------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/compiler-rt/lib/i386/ashldi3.S b/compiler-rt/lib/builtins/i386/ashldi3.S
index a5da1ace1c3..a5da1ace1c3 100644
--- a/compiler-rt/lib/i386/ashldi3.S
+++ b/compiler-rt/lib/builtins/i386/ashldi3.S
diff --git a/compiler-rt/lib/i386/ashrdi3.S b/compiler-rt/lib/builtins/i386/ashrdi3.S
index ab0fcfcc9ff..ab0fcfcc9ff 100644
--- a/compiler-rt/lib/i386/ashrdi3.S
+++ b/compiler-rt/lib/builtins/i386/ashrdi3.S
diff --git a/compiler-rt/lib/i386/divdi3.S b/compiler-rt/lib/builtins/i386/divdi3.S
index 5afec5f9cc9..5afec5f9cc9 100644
--- a/compiler-rt/lib/i386/divdi3.S
+++ b/compiler-rt/lib/builtins/i386/divdi3.S
diff --git a/compiler-rt/lib/i386/floatdidf.S b/compiler-rt/lib/builtins/i386/floatdidf.S
index 493608886ca..493608886ca 100644
--- a/compiler-rt/lib/i386/floatdidf.S
+++ b/compiler-rt/lib/builtins/i386/floatdidf.S
diff --git a/compiler-rt/lib/i386/floatdisf.S b/compiler-rt/lib/builtins/i386/floatdisf.S
index 8340331b85a..8340331b85a 100644
--- a/compiler-rt/lib/i386/floatdisf.S
+++ b/compiler-rt/lib/builtins/i386/floatdisf.S
diff --git a/compiler-rt/lib/i386/floatdixf.S b/compiler-rt/lib/builtins/i386/floatdixf.S
index eaa34d744fa..eaa34d744fa 100644
--- a/compiler-rt/lib/i386/floatdixf.S
+++ b/compiler-rt/lib/builtins/i386/floatdixf.S
diff --git a/compiler-rt/lib/i386/floatundidf.S b/compiler-rt/lib/builtins/i386/floatundidf.S
index 5b8787ba627..5b8787ba627 100644
--- a/compiler-rt/lib/i386/floatundidf.S
+++ b/compiler-rt/lib/builtins/i386/floatundidf.S
diff --git a/compiler-rt/lib/i386/floatundisf.S b/compiler-rt/lib/builtins/i386/floatundisf.S
index 2253021bcdb..2253021bcdb 100644
--- a/compiler-rt/lib/i386/floatundisf.S
+++ b/compiler-rt/lib/builtins/i386/floatundisf.S
diff --git a/compiler-rt/lib/i386/floatundixf.S b/compiler-rt/lib/builtins/i386/floatundixf.S
index b728d06972e..b728d06972e 100644
--- a/compiler-rt/lib/i386/floatundixf.S
+++ b/compiler-rt/lib/builtins/i386/floatundixf.S
diff --git a/compiler-rt/lib/i386/lshrdi3.S b/compiler-rt/lib/builtins/i386/lshrdi3.S
index dcfc331693f..dcfc331693f 100644
--- a/compiler-rt/lib/i386/lshrdi3.S
+++ b/compiler-rt/lib/builtins/i386/lshrdi3.S
diff --git a/compiler-rt/lib/i386/moddi3.S b/compiler-rt/lib/builtins/i386/moddi3.S
index 79e4fc2132b..79e4fc2132b 100644
--- a/compiler-rt/lib/i386/moddi3.S
+++ b/compiler-rt/lib/builtins/i386/moddi3.S
diff --git a/compiler-rt/lib/i386/muldi3.S b/compiler-rt/lib/builtins/i386/muldi3.S
index 5af1136c14a..5af1136c14a 100644
--- a/compiler-rt/lib/i386/muldi3.S
+++ b/compiler-rt/lib/builtins/i386/muldi3.S
diff --git a/compiler-rt/lib/i386/udivdi3.S b/compiler-rt/lib/builtins/i386/udivdi3.S
index 5072b221c1c..5072b221c1c 100644
--- a/compiler-rt/lib/i386/udivdi3.S
+++ b/compiler-rt/lib/builtins/i386/udivdi3.S
diff --git a/compiler-rt/lib/i386/umoddi3.S b/compiler-rt/lib/builtins/i386/umoddi3.S
index 63cefc20728..63cefc20728 100644
--- a/compiler-rt/lib/i386/umoddi3.S
+++ b/compiler-rt/lib/builtins/i386/umoddi3.S
diff --git a/compiler-rt/lib/int_endianness.h b/compiler-rt/lib/builtins/int_endianness.h
index c465a985eeb..c465a985eeb 100644
--- a/compiler-rt/lib/int_endianness.h
+++ b/compiler-rt/lib/builtins/int_endianness.h
diff --git a/compiler-rt/lib/int_lib.h b/compiler-rt/lib/builtins/int_lib.h
index daeaa9e5706..daeaa9e5706 100644
--- a/compiler-rt/lib/int_lib.h
+++ b/compiler-rt/lib/builtins/int_lib.h
diff --git a/compiler-rt/lib/int_math.h b/compiler-rt/lib/builtins/int_math.h
index d6b4bdae162..d6b4bdae162 100644
--- a/compiler-rt/lib/int_math.h
+++ b/compiler-rt/lib/builtins/int_math.h
diff --git a/compiler-rt/lib/int_types.h b/compiler-rt/lib/builtins/int_types.h
index fcce390f9a9..fcce390f9a9 100644
--- a/compiler-rt/lib/int_types.h
+++ b/compiler-rt/lib/builtins/int_types.h
diff --git a/compiler-rt/lib/int_util.c b/compiler-rt/lib/builtins/int_util.c
index 323e46179e6..323e46179e6 100644
--- a/compiler-rt/lib/int_util.c
+++ b/compiler-rt/lib/builtins/int_util.c
diff --git a/compiler-rt/lib/int_util.h b/compiler-rt/lib/builtins/int_util.h
index 1348b85eb92..1348b85eb92 100644
--- a/compiler-rt/lib/int_util.h
+++ b/compiler-rt/lib/builtins/int_util.h
diff --git a/compiler-rt/lib/lshrdi3.c b/compiler-rt/lib/builtins/lshrdi3.c
index 6b1ea923b77..6b1ea923b77 100644
--- a/compiler-rt/lib/lshrdi3.c
+++ b/compiler-rt/lib/builtins/lshrdi3.c
diff --git a/compiler-rt/lib/lshrti3.c b/compiler-rt/lib/builtins/lshrti3.c
index be768143b58..be768143b58 100644
--- a/compiler-rt/lib/lshrti3.c
+++ b/compiler-rt/lib/builtins/lshrti3.c
diff --git a/compiler-rt/lib/moddi3.c b/compiler-rt/lib/builtins/moddi3.c
index 2f3b9cc4f29..2f3b9cc4f29 100644
--- a/compiler-rt/lib/moddi3.c
+++ b/compiler-rt/lib/builtins/moddi3.c
diff --git a/compiler-rt/lib/modsi3.c b/compiler-rt/lib/builtins/modsi3.c
index d16213c4903..d16213c4903 100644
--- a/compiler-rt/lib/modsi3.c
+++ b/compiler-rt/lib/builtins/modsi3.c
diff --git a/compiler-rt/lib/modti3.c b/compiler-rt/lib/builtins/modti3.c
index 752202d45e0..752202d45e0 100644
--- a/compiler-rt/lib/modti3.c
+++ b/compiler-rt/lib/builtins/modti3.c
diff --git a/compiler-rt/lib/muldc3.c b/compiler-rt/lib/builtins/muldc3.c
index 5f4a6d16ebf..5f4a6d16ebf 100644
--- a/compiler-rt/lib/muldc3.c
+++ b/compiler-rt/lib/builtins/muldc3.c
diff --git a/compiler-rt/lib/muldf3.c b/compiler-rt/lib/builtins/muldf3.c
index c38edba90cf..c38edba90cf 100644
--- a/compiler-rt/lib/muldf3.c
+++ b/compiler-rt/lib/builtins/muldf3.c
diff --git a/compiler-rt/lib/muldi3.c b/compiler-rt/lib/builtins/muldi3.c
index 2dae44c11b9..2dae44c11b9 100644
--- a/compiler-rt/lib/muldi3.c
+++ b/compiler-rt/lib/builtins/muldi3.c
diff --git a/compiler-rt/lib/mulodi4.c b/compiler-rt/lib/builtins/mulodi4.c
index 0c1b5cdae76..0c1b5cdae76 100644
--- a/compiler-rt/lib/mulodi4.c
+++ b/compiler-rt/lib/builtins/mulodi4.c
diff --git a/compiler-rt/lib/mulosi4.c b/compiler-rt/lib/builtins/mulosi4.c
index f3398d1fc7b..f3398d1fc7b 100644
--- a/compiler-rt/lib/mulosi4.c
+++ b/compiler-rt/lib/builtins/mulosi4.c
diff --git a/compiler-rt/lib/muloti4.c b/compiler-rt/lib/builtins/muloti4.c
index f58dd074eea..f58dd074eea 100644
--- a/compiler-rt/lib/muloti4.c
+++ b/compiler-rt/lib/builtins/muloti4.c
diff --git a/compiler-rt/lib/mulsc3.c b/compiler-rt/lib/builtins/mulsc3.c
index 6d433fbc45f..6d433fbc45f 100644
--- a/compiler-rt/lib/mulsc3.c
+++ b/compiler-rt/lib/builtins/mulsc3.c
diff --git a/compiler-rt/lib/mulsf3.c b/compiler-rt/lib/builtins/mulsf3.c
index 861a9ba5f90..861a9ba5f90 100644
--- a/compiler-rt/lib/mulsf3.c
+++ b/compiler-rt/lib/builtins/mulsf3.c
diff --git a/compiler-rt/lib/multi3.c b/compiler-rt/lib/builtins/multi3.c
index 0b8730f08ce..0b8730f08ce 100644
--- a/compiler-rt/lib/multi3.c
+++ b/compiler-rt/lib/builtins/multi3.c
diff --git a/compiler-rt/lib/mulvdi3.c b/compiler-rt/lib/builtins/mulvdi3.c
index bcc8e659be4..bcc8e659be4 100644
--- a/compiler-rt/lib/mulvdi3.c
+++ b/compiler-rt/lib/builtins/mulvdi3.c
diff --git a/compiler-rt/lib/mulvsi3.c b/compiler-rt/lib/builtins/mulvsi3.c
index d372b20175e..d372b20175e 100644
--- a/compiler-rt/lib/mulvsi3.c
+++ b/compiler-rt/lib/builtins/mulvsi3.c
diff --git a/compiler-rt/lib/mulvti3.c b/compiler-rt/lib/builtins/mulvti3.c
index 31f7d2fd374..31f7d2fd374 100644
--- a/compiler-rt/lib/mulvti3.c
+++ b/compiler-rt/lib/builtins/mulvti3.c
diff --git a/compiler-rt/lib/mulxc3.c b/compiler-rt/lib/builtins/mulxc3.c
index cec0573688a..cec0573688a 100644
--- a/compiler-rt/lib/mulxc3.c
+++ b/compiler-rt/lib/builtins/mulxc3.c
diff --git a/compiler-rt/lib/negdf2.c b/compiler-rt/lib/builtins/negdf2.c
index 4e17513a9d0..4e17513a9d0 100644
--- a/compiler-rt/lib/negdf2.c
+++ b/compiler-rt/lib/builtins/negdf2.c
diff --git a/compiler-rt/lib/negdi2.c b/compiler-rt/lib/builtins/negdi2.c
index b000dda3b83..b000dda3b83 100644
--- a/compiler-rt/lib/negdi2.c
+++ b/compiler-rt/lib/builtins/negdi2.c
diff --git a/compiler-rt/lib/negsf2.c b/compiler-rt/lib/builtins/negsf2.c
index 29c17be4145..29c17be4145 100644
--- a/compiler-rt/lib/negsf2.c
+++ b/compiler-rt/lib/builtins/negsf2.c
diff --git a/compiler-rt/lib/negti2.c b/compiler-rt/lib/builtins/negti2.c
index f7e4ad3b94a..f7e4ad3b94a 100644
--- a/compiler-rt/lib/negti2.c
+++ b/compiler-rt/lib/builtins/negti2.c
diff --git a/compiler-rt/lib/negvdi2.c b/compiler-rt/lib/builtins/negvdi2.c
index e336ecf28f0..e336ecf28f0 100644
--- a/compiler-rt/lib/negvdi2.c
+++ b/compiler-rt/lib/builtins/negvdi2.c
diff --git a/compiler-rt/lib/negvsi2.c b/compiler-rt/lib/builtins/negvsi2.c
index b9e93fef06c..b9e93fef06c 100644
--- a/compiler-rt/lib/negvsi2.c
+++ b/compiler-rt/lib/builtins/negvsi2.c
diff --git a/compiler-rt/lib/negvti2.c b/compiler-rt/lib/builtins/negvti2.c
index 05df6152fcd..05df6152fcd 100644
--- a/compiler-rt/lib/negvti2.c
+++ b/compiler-rt/lib/builtins/negvti2.c
diff --git a/compiler-rt/lib/paritydi2.c b/compiler-rt/lib/builtins/paritydi2.c
index 2ded54c90b9..2ded54c90b9 100644
--- a/compiler-rt/lib/paritydi2.c
+++ b/compiler-rt/lib/builtins/paritydi2.c
diff --git a/compiler-rt/lib/paritysi2.c b/compiler-rt/lib/builtins/paritysi2.c
index 59998466384..59998466384 100644
--- a/compiler-rt/lib/paritysi2.c
+++ b/compiler-rt/lib/builtins/paritysi2.c
diff --git a/compiler-rt/lib/parityti2.c b/compiler-rt/lib/builtins/parityti2.c
index a1f47b1d931..a1f47b1d931 100644
--- a/compiler-rt/lib/parityti2.c
+++ b/compiler-rt/lib/builtins/parityti2.c
diff --git a/compiler-rt/lib/popcountdi2.c b/compiler-rt/lib/builtins/popcountdi2.c
index 5e8a62f075e..5e8a62f075e 100644
--- a/compiler-rt/lib/popcountdi2.c
+++ b/compiler-rt/lib/builtins/popcountdi2.c
diff --git a/compiler-rt/lib/popcountsi2.c b/compiler-rt/lib/builtins/popcountsi2.c
index 44544ff4989..44544ff4989 100644
--- a/compiler-rt/lib/popcountsi2.c
+++ b/compiler-rt/lib/builtins/popcountsi2.c
diff --git a/compiler-rt/lib/popcountti2.c b/compiler-rt/lib/builtins/popcountti2.c
index 95666738f72..95666738f72 100644
--- a/compiler-rt/lib/popcountti2.c
+++ b/compiler-rt/lib/builtins/popcountti2.c
diff --git a/compiler-rt/lib/powidf2.c b/compiler-rt/lib/builtins/powidf2.c
index ac13b172b04..ac13b172b04 100644
--- a/compiler-rt/lib/powidf2.c
+++ b/compiler-rt/lib/builtins/powidf2.c
diff --git a/compiler-rt/lib/powisf2.c b/compiler-rt/lib/builtins/powisf2.c
index 0c400ec6dd6..0c400ec6dd6 100644
--- a/compiler-rt/lib/powisf2.c
+++ b/compiler-rt/lib/builtins/powisf2.c
diff --git a/compiler-rt/lib/powitf2.c b/compiler-rt/lib/builtins/powitf2.c
index d3b934924f3..d3b934924f3 100644
--- a/compiler-rt/lib/powitf2.c
+++ b/compiler-rt/lib/builtins/powitf2.c
diff --git a/compiler-rt/lib/powixf2.c b/compiler-rt/lib/builtins/powixf2.c
index f050964d359..f050964d359 100644
--- a/compiler-rt/lib/powixf2.c
+++ b/compiler-rt/lib/builtins/powixf2.c
diff --git a/compiler-rt/lib/ppc/DD.h b/compiler-rt/lib/builtins/ppc/DD.h
index fc3e41cbe07..fc3e41cbe07 100644
--- a/compiler-rt/lib/ppc/DD.h
+++ b/compiler-rt/lib/builtins/ppc/DD.h
diff --git a/compiler-rt/lib/ppc/Makefile.mk b/compiler-rt/lib/builtins/ppc/Makefile.mk
index b78d3860c53..0adc623aa04 100644
--- a/compiler-rt/lib/ppc/Makefile.mk
+++ b/compiler-rt/lib/builtins/ppc/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/ppc/Makefile.mk ----------------------------------*- Makefile -*--===#
+#===- lib/builtins/ppc/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/compiler-rt/lib/ppc/divtc3.c b/compiler-rt/lib/builtins/ppc/divtc3.c
index 29912818631..29912818631 100644
--- a/compiler-rt/lib/ppc/divtc3.c
+++ b/compiler-rt/lib/builtins/ppc/divtc3.c
diff --git a/compiler-rt/lib/ppc/fixtfdi.c b/compiler-rt/lib/builtins/ppc/fixtfdi.c
index 56e7b3fbf3e..56e7b3fbf3e 100644
--- a/compiler-rt/lib/ppc/fixtfdi.c
+++ b/compiler-rt/lib/builtins/ppc/fixtfdi.c
diff --git a/compiler-rt/lib/ppc/fixunstfdi.c b/compiler-rt/lib/builtins/ppc/fixunstfdi.c
index 5e6e2cedf6a..5e6e2cedf6a 100644
--- a/compiler-rt/lib/ppc/fixunstfdi.c
+++ b/compiler-rt/lib/builtins/ppc/fixunstfdi.c
diff --git a/compiler-rt/lib/ppc/floatditf.c b/compiler-rt/lib/builtins/ppc/floatditf.c
index beabdd01742..beabdd01742 100644
--- a/compiler-rt/lib/ppc/floatditf.c
+++ b/compiler-rt/lib/builtins/ppc/floatditf.c
diff --git a/compiler-rt/lib/ppc/floatunditf.c b/compiler-rt/lib/builtins/ppc/floatunditf.c
index b12e1e738fd..b12e1e738fd 100644
--- a/compiler-rt/lib/ppc/floatunditf.c
+++ b/compiler-rt/lib/builtins/ppc/floatunditf.c
diff --git a/compiler-rt/lib/ppc/gcc_qadd.c b/compiler-rt/lib/builtins/ppc/gcc_qadd.c
index 32e16e9d1d1..32e16e9d1d1 100644
--- a/compiler-rt/lib/ppc/gcc_qadd.c
+++ b/compiler-rt/lib/builtins/ppc/gcc_qadd.c
diff --git a/compiler-rt/lib/ppc/gcc_qdiv.c b/compiler-rt/lib/builtins/ppc/gcc_qdiv.c
index 70aa00b6440..70aa00b6440 100644
--- a/compiler-rt/lib/ppc/gcc_qdiv.c
+++ b/compiler-rt/lib/builtins/ppc/gcc_qdiv.c
diff --git a/compiler-rt/lib/ppc/gcc_qmul.c b/compiler-rt/lib/builtins/ppc/gcc_qmul.c
index fb4c5164ccb..fb4c5164ccb 100644
--- a/compiler-rt/lib/ppc/gcc_qmul.c
+++ b/compiler-rt/lib/builtins/ppc/gcc_qmul.c
diff --git a/compiler-rt/lib/ppc/gcc_qsub.c b/compiler-rt/lib/builtins/ppc/gcc_qsub.c
index c092e24dbda..c092e24dbda 100644
--- a/compiler-rt/lib/ppc/gcc_qsub.c
+++ b/compiler-rt/lib/builtins/ppc/gcc_qsub.c
diff --git a/compiler-rt/lib/ppc/multc3.c b/compiler-rt/lib/builtins/ppc/multc3.c
index 738b65a83b0..738b65a83b0 100644
--- a/compiler-rt/lib/ppc/multc3.c
+++ b/compiler-rt/lib/builtins/ppc/multc3.c
diff --git a/compiler-rt/lib/ppc/restFP.S b/compiler-rt/lib/builtins/ppc/restFP.S
index 95032897c0d..95032897c0d 100644
--- a/compiler-rt/lib/ppc/restFP.S
+++ b/compiler-rt/lib/builtins/ppc/restFP.S
diff --git a/compiler-rt/lib/ppc/saveFP.S b/compiler-rt/lib/builtins/ppc/saveFP.S
index 72bd459f4cc..72bd459f4cc 100644
--- a/compiler-rt/lib/ppc/saveFP.S
+++ b/compiler-rt/lib/builtins/ppc/saveFP.S
diff --git a/compiler-rt/lib/subdf3.c b/compiler-rt/lib/builtins/subdf3.c
index 66fb1a54fca..66fb1a54fca 100644
--- a/compiler-rt/lib/subdf3.c
+++ b/compiler-rt/lib/builtins/subdf3.c
diff --git a/compiler-rt/lib/subsf3.c b/compiler-rt/lib/builtins/subsf3.c
index 3659cd8b822..3659cd8b822 100644
--- a/compiler-rt/lib/subsf3.c
+++ b/compiler-rt/lib/builtins/subsf3.c
diff --git a/compiler-rt/lib/subvdi3.c b/compiler-rt/lib/builtins/subvdi3.c
index 0f1f924effc..0f1f924effc 100644
--- a/compiler-rt/lib/subvdi3.c
+++ b/compiler-rt/lib/builtins/subvdi3.c
diff --git a/compiler-rt/lib/subvsi3.c b/compiler-rt/lib/builtins/subvsi3.c
index ec4594c9f0e..ec4594c9f0e 100644
--- a/compiler-rt/lib/subvsi3.c
+++ b/compiler-rt/lib/builtins/subvsi3.c
diff --git a/compiler-rt/lib/subvti3.c b/compiler-rt/lib/builtins/subvti3.c
index b32df5e6c7e..b32df5e6c7e 100644
--- a/compiler-rt/lib/subvti3.c
+++ b/compiler-rt/lib/builtins/subvti3.c
diff --git a/compiler-rt/lib/trampoline_setup.c b/compiler-rt/lib/builtins/trampoline_setup.c
index e0765b16b0b..e0765b16b0b 100644
--- a/compiler-rt/lib/trampoline_setup.c
+++ b/compiler-rt/lib/builtins/trampoline_setup.c
diff --git a/compiler-rt/lib/truncdfsf2.c b/compiler-rt/lib/builtins/truncdfsf2.c
index 61c909a22d8..61c909a22d8 100644
--- a/compiler-rt/lib/truncdfsf2.c
+++ b/compiler-rt/lib/builtins/truncdfsf2.c
diff --git a/compiler-rt/lib/ucmpdi2.c b/compiler-rt/lib/builtins/ucmpdi2.c
index 40af23613b1..40af23613b1 100644
--- a/compiler-rt/lib/ucmpdi2.c
+++ b/compiler-rt/lib/builtins/ucmpdi2.c
diff --git a/compiler-rt/lib/ucmpti2.c b/compiler-rt/lib/builtins/ucmpti2.c
index 5466d217428..5466d217428 100644
--- a/compiler-rt/lib/ucmpti2.c
+++ b/compiler-rt/lib/builtins/ucmpti2.c
diff --git a/compiler-rt/lib/udivdi3.c b/compiler-rt/lib/builtins/udivdi3.c
index 6c0303df3d4..6c0303df3d4 100644
--- a/compiler-rt/lib/udivdi3.c
+++ b/compiler-rt/lib/builtins/udivdi3.c
diff --git a/compiler-rt/lib/udivmoddi4.c b/compiler-rt/lib/builtins/udivmoddi4.c
index 57282d5b51c..57282d5b51c 100644
--- a/compiler-rt/lib/udivmoddi4.c
+++ b/compiler-rt/lib/builtins/udivmoddi4.c
diff --git a/compiler-rt/lib/udivmodsi4.c b/compiler-rt/lib/builtins/udivmodsi4.c
index 5b49089fccc..5b49089fccc 100644
--- a/compiler-rt/lib/udivmodsi4.c
+++ b/compiler-rt/lib/builtins/udivmodsi4.c
diff --git a/compiler-rt/lib/udivmodti4.c b/compiler-rt/lib/builtins/udivmodti4.c
index f619c74955e..f619c74955e 100644
--- a/compiler-rt/lib/udivmodti4.c
+++ b/compiler-rt/lib/builtins/udivmodti4.c
diff --git a/compiler-rt/lib/udivsi3.c b/compiler-rt/lib/builtins/udivsi3.c
index 5d0140cc3e7..5d0140cc3e7 100644
--- a/compiler-rt/lib/udivsi3.c
+++ b/compiler-rt/lib/builtins/udivsi3.c
diff --git a/compiler-rt/lib/udivti3.c b/compiler-rt/lib/builtins/udivti3.c
index d9e1bb46f5c..d9e1bb46f5c 100644
--- a/compiler-rt/lib/udivti3.c
+++ b/compiler-rt/lib/builtins/udivti3.c
diff --git a/compiler-rt/lib/umoddi3.c b/compiler-rt/lib/builtins/umoddi3.c
index 3541ab6e91d..3541ab6e91d 100644
--- a/compiler-rt/lib/umoddi3.c
+++ b/compiler-rt/lib/builtins/umoddi3.c
diff --git a/compiler-rt/lib/umodsi3.c b/compiler-rt/lib/builtins/umodsi3.c
index aae741d896d..aae741d896d 100644
--- a/compiler-rt/lib/umodsi3.c
+++ b/compiler-rt/lib/builtins/umodsi3.c
diff --git a/compiler-rt/lib/umodti3.c b/compiler-rt/lib/builtins/umodti3.c
index 8ebe7f0dcf0..8ebe7f0dcf0 100644
--- a/compiler-rt/lib/umodti3.c
+++ b/compiler-rt/lib/builtins/umodti3.c
diff --git a/compiler-rt/lib/x86_64/Makefile.mk b/compiler-rt/lib/builtins/x86_64/Makefile.mk
index 11bbe5dbe42..83848dddd96 100644
--- a/compiler-rt/lib/x86_64/Makefile.mk
+++ b/compiler-rt/lib/builtins/x86_64/Makefile.mk
@@ -1,4 +1,4 @@
-#===- lib/x86_64/Makefile.mk -------------------------------*- Makefile -*--===#
+#===- lib/builtins/x86_64/Makefile.mk ----------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/compiler-rt/lib/x86_64/floatdidf.c b/compiler-rt/lib/builtins/x86_64/floatdidf.c
index 388404e5e08..388404e5e08 100644
--- a/compiler-rt/lib/x86_64/floatdidf.c
+++ b/compiler-rt/lib/builtins/x86_64/floatdidf.c
diff --git a/compiler-rt/lib/x86_64/floatdisf.c b/compiler-rt/lib/builtins/x86_64/floatdisf.c
index 96c3728e92c..96c3728e92c 100644
--- a/compiler-rt/lib/x86_64/floatdisf.c
+++ b/compiler-rt/lib/builtins/x86_64/floatdisf.c
diff --git a/compiler-rt/lib/x86_64/floatdixf.c b/compiler-rt/lib/builtins/x86_64/floatdixf.c
index c01193a82b5..c01193a82b5 100644
--- a/compiler-rt/lib/x86_64/floatdixf.c
+++ b/compiler-rt/lib/builtins/x86_64/floatdixf.c
diff --git a/compiler-rt/lib/x86_64/floatundidf.S b/compiler-rt/lib/builtins/x86_64/floatundidf.S
index 1df3d7479c8..1df3d7479c8 100644
--- a/compiler-rt/lib/x86_64/floatundidf.S
+++ b/compiler-rt/lib/builtins/x86_64/floatundidf.S
diff --git a/compiler-rt/lib/x86_64/floatundisf.S b/compiler-rt/lib/builtins/x86_64/floatundisf.S
index 7dd5c329b52..7dd5c329b52 100644
--- a/compiler-rt/lib/x86_64/floatundisf.S
+++ b/compiler-rt/lib/builtins/x86_64/floatundisf.S
diff --git a/compiler-rt/lib/x86_64/floatundixf.S b/compiler-rt/lib/builtins/x86_64/floatundixf.S
index b05954a0bd5..b05954a0bd5 100644
--- a/compiler-rt/lib/x86_64/floatundixf.S
+++ b/compiler-rt/lib/builtins/x86_64/floatundixf.S
diff --git a/compiler-rt/make/subdir.mk b/compiler-rt/make/subdir.mk
index 6dadc7b6131..f81c25f032b 100644
--- a/compiler-rt/make/subdir.mk
+++ b/compiler-rt/make/subdir.mk
@@ -2,12 +2,13 @@
 #
 # Subdirectory makefiles must define:
 #   SubDirs - The subdirectories to traverse.
+#
+# Subdirectory makefiles may define:
+#   ModuleName - The library name for objects in that directory.
 #   ObjNames - The objects available in that directory.
 #   Implementation - The library configuration the objects should go in (Generic
 #                    or Optimized)
 #   Dependencies - Any dependences for the object files.
-#
-# Subdirectory makefiles may define:
 #   OnlyArchs - Only build the objects for the listed archs.
 #   OnlyConfigs - Only build the objects for the listed configurations.
 
@@ -20,9 +21,9 @@ endif
 
 # The list of variables which are intended to be overridden in a subdirectory
 # makefile.
-RequiredSubdirVariables := \
-	ModuleName SubDirs ObjNames Implementation Dependencies
-OptionalSubdirVariables := OnlyArchs OnlyConfigs
+RequiredSubdirVariables := SubDirs 
+OptionalSubdirVariables := ModuleName OnlyArchs OnlyConfigs \
+	ObjNames Implementation Dependencies
 
 # Template: subdir_traverse_template subdir
 define subdir_traverse_template