aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
committerEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
commitf170b6928b38a264ce005e5fa80d428364b6f659 (patch)
tree875c98489b0419eb321390a6093da33c5116f79a
parent217b614317dad692116a3a06fe94ea8f61a59edb (diff)
downloadsrc-vendor/compiler-rt/compiler-rt-r127823.tar.gz
src-vendor/compiler-rt/compiler-rt-r127823.zip
Import compiler-rt r127823.vendor/compiler-rt/compiler-rt-r127823
Changes: - License change; now it's also dual licensed under the MIT licence. - Addition of divmodsi4 and udivmodsi4.
-rw-r--r--CREDITS.TXT3
-rw-r--r--LICENSE.TXT53
-rw-r--r--README.txt8
-rw-r--r--lib/absvdi2.c4
-rw-r--r--lib/absvsi2.c4
-rw-r--r--lib/absvti2.c4
-rw-r--r--lib/adddf3.c4
-rw-r--r--lib/addsf3.c4
-rw-r--r--lib/addvdi3.c4
-rw-r--r--lib/addvsi3.c4
-rw-r--r--lib/addvti3.c4
-rw-r--r--lib/apple_versioning.c4
-rw-r--r--lib/arm/adddf3vfp.S4
-rw-r--r--lib/arm/addsf3vfp.S4
-rw-r--r--lib/arm/bswapdi2.S4
-rw-r--r--lib/arm/bswapsi2.S4
-rw-r--r--lib/arm/comparesf2.S4
-rw-r--r--lib/arm/divdf3vfp.S4
-rw-r--r--lib/arm/divsf3vfp.S4
-rw-r--r--lib/arm/eqdf2vfp.S4
-rw-r--r--lib/arm/eqsf2vfp.S4
-rw-r--r--lib/arm/extendsfdf2vfp.S4
-rw-r--r--lib/arm/fixdfsivfp.S4
-rw-r--r--lib/arm/fixsfsivfp.S4
-rw-r--r--lib/arm/fixunsdfsivfp.S4
-rw-r--r--lib/arm/fixunssfsivfp.S4
-rw-r--r--lib/arm/floatsidfvfp.S4
-rw-r--r--lib/arm/floatsisfvfp.S4
-rw-r--r--lib/arm/floatunssidfvfp.S4
-rw-r--r--lib/arm/floatunssisfvfp.S4
-rw-r--r--lib/arm/gedf2vfp.S4
-rw-r--r--lib/arm/gesf2vfp.S4
-rw-r--r--lib/arm/gtdf2vfp.S4
-rw-r--r--lib/arm/gtsf2vfp.S4
-rw-r--r--lib/arm/ledf2vfp.S4
-rw-r--r--lib/arm/lesf2vfp.S4
-rw-r--r--lib/arm/ltdf2vfp.S4
-rw-r--r--lib/arm/ltsf2vfp.S4
-rw-r--r--lib/arm/modsi3.S4
-rw-r--r--lib/arm/muldf3vfp.S4
-rw-r--r--lib/arm/mulsf3vfp.S4
-rw-r--r--lib/arm/nedf2vfp.S4
-rw-r--r--lib/arm/negdf2vfp.S4
-rw-r--r--lib/arm/negsf2vfp.S4
-rw-r--r--lib/arm/nesf2vfp.S4
-rw-r--r--lib/arm/restore_vfp_d8_d15_regs.S4
-rw-r--r--lib/arm/save_vfp_d8_d15_regs.S4
-rw-r--r--lib/arm/softfloat-alias.list21
-rw-r--r--lib/arm/subdf3vfp.S4
-rw-r--r--lib/arm/subsf3vfp.S4
-rw-r--r--lib/arm/switch16.S4
-rw-r--r--lib/arm/switch32.S4
-rw-r--r--lib/arm/switch8.S4
-rw-r--r--lib/arm/switchu8.S4
-rw-r--r--lib/arm/sync_synchronize.S4
-rw-r--r--lib/arm/truncdfsf2vfp.S4
-rw-r--r--lib/arm/unorddf2vfp.S4
-rw-r--r--lib/arm/unordsf2vfp.S4
-rw-r--r--lib/ashldi3.c4
-rw-r--r--lib/ashlti3.c4
-rw-r--r--lib/ashrdi3.c4
-rw-r--r--lib/ashrti3.c4
-rw-r--r--lib/assembly.h4
-rw-r--r--lib/clear_cache.c4
-rw-r--r--lib/clzdi2.c4
-rw-r--r--lib/clzsi2.c4
-rw-r--r--lib/clzti2.c4
-rw-r--r--lib/cmpdi2.c4
-rw-r--r--lib/cmpti2.c4
-rw-r--r--lib/comparedf2.c4
-rw-r--r--lib/comparesf2.c4
-rw-r--r--lib/ctzdi2.c4
-rw-r--r--lib/ctzsi2.c4
-rw-r--r--lib/ctzti2.c4
-rw-r--r--lib/divdc3.c4
-rw-r--r--lib/divdf3.c4
-rw-r--r--lib/divdi3.c4
-rw-r--r--lib/divmodsi4.c30
-rw-r--r--lib/divsc3.c4
-rw-r--r--lib/divsf3.c4
-rw-r--r--lib/divsi3.c4
-rw-r--r--lib/divti3.c4
-rw-r--r--lib/divxc3.c4
-rw-r--r--lib/enable_execute_stack.c4
-rw-r--r--lib/endianness.h4
-rw-r--r--lib/eprintf.c4
-rw-r--r--lib/extendsfdf2.c4
-rw-r--r--lib/ffsdi2.c4
-rw-r--r--lib/ffsti2.c4
-rw-r--r--lib/fixdfdi.c4
-rw-r--r--lib/fixdfsi.c4
-rw-r--r--lib/fixdfti.c4
-rw-r--r--lib/fixsfdi.c4
-rw-r--r--lib/fixsfsi.c4
-rw-r--r--lib/fixsfti.c4
-rw-r--r--lib/fixunsdfdi.c4
-rw-r--r--lib/fixunsdfsi.c4
-rw-r--r--lib/fixunsdfti.c4
-rw-r--r--lib/fixunssfdi.c4
-rw-r--r--lib/fixunssfsi.c4
-rw-r--r--lib/fixunssfti.c4
-rw-r--r--lib/fixunsxfdi.c4
-rw-r--r--lib/fixunsxfsi.c4
-rw-r--r--lib/fixunsxfti.c4
-rw-r--r--lib/fixxfdi.c4
-rw-r--r--lib/fixxfti.c4
-rw-r--r--lib/floatdidf.c4
-rw-r--r--lib/floatdisf.c4
-rw-r--r--lib/floatdixf.c4
-rw-r--r--lib/floatsidf.c4
-rw-r--r--lib/floatsisf.c4
-rw-r--r--lib/floattidf.c4
-rw-r--r--lib/floattisf.c4
-rw-r--r--lib/floattixf.c4
-rw-r--r--lib/floatundidf.c4
-rw-r--r--lib/floatundisf.c4
-rw-r--r--lib/floatundixf.c4
-rw-r--r--lib/floatunsidf.c4
-rw-r--r--lib/floatunsisf.c4
-rw-r--r--lib/floatuntidf.c4
-rw-r--r--lib/floatuntisf.c4
-rw-r--r--lib/floatuntixf.c4
-rw-r--r--lib/fp_lib.h4
-rw-r--r--lib/gcc_personality_v0.c4
-rw-r--r--lib/i386/ashldi3.S4
-rw-r--r--lib/i386/ashrdi3.S4
-rw-r--r--lib/i386/divdi3.S4
-rw-r--r--lib/i386/floatdidf.S4
-rw-r--r--lib/i386/floatdisf.S4
-rw-r--r--lib/i386/floatdixf.S4
-rw-r--r--lib/i386/floatundidf.S4
-rw-r--r--lib/i386/floatundisf.S4
-rw-r--r--lib/i386/floatundixf.S4
-rw-r--r--lib/i386/lshrdi3.S4
-rw-r--r--lib/i386/moddi3.S4
-rw-r--r--lib/i386/muldi3.S4
-rw-r--r--lib/i386/udivdi3.S4
-rw-r--r--lib/i386/umoddi3.S4
-rw-r--r--lib/int_lib.h5
-rw-r--r--lib/lshrdi3.c4
-rw-r--r--lib/lshrti3.c4
-rw-r--r--lib/moddi3.c4
-rw-r--r--lib/modsi3.c8
-rw-r--r--lib/modti3.c4
-rw-r--r--lib/muldc3.c4
-rw-r--r--lib/muldf3.c4
-rw-r--r--lib/muldi3.c4
-rw-r--r--lib/mulsc3.c4
-rw-r--r--lib/mulsf3.c4
-rw-r--r--lib/multi3.c4
-rw-r--r--lib/mulvdi3.c4
-rw-r--r--lib/mulvsi3.c4
-rw-r--r--lib/mulvti3.c4
-rw-r--r--lib/mulxc3.c4
-rw-r--r--lib/negdf2.c4
-rw-r--r--lib/negdi2.c4
-rw-r--r--lib/negsf2.c4
-rw-r--r--lib/negti2.c4
-rw-r--r--lib/negvdi2.c4
-rw-r--r--lib/negvsi2.c4
-rw-r--r--lib/negvti2.c4
-rw-r--r--lib/paritydi2.c4
-rw-r--r--lib/paritysi2.c4
-rw-r--r--lib/parityti2.c4
-rw-r--r--lib/popcountdi2.c4
-rw-r--r--lib/popcountsi2.c4
-rw-r--r--lib/popcountti2.c4
-rw-r--r--lib/powidf2.c4
-rw-r--r--lib/powisf2.c4
-rw-r--r--lib/powitf2.c4
-rw-r--r--lib/powixf2.c4
-rw-r--r--lib/ppc/restFP.S4
-rw-r--r--lib/ppc/saveFP.S4
-rw-r--r--lib/subvdi3.c4
-rw-r--r--lib/subvsi3.c4
-rw-r--r--lib/subvti3.c4
-rw-r--r--lib/trampoline_setup.c4
-rw-r--r--lib/truncdfsf2.c4
-rw-r--r--lib/ucmpdi2.c4
-rw-r--r--lib/ucmpti2.c4
-rw-r--r--lib/udivdi3.c4
-rw-r--r--lib/udivmoddi4.c4
-rw-r--r--lib/udivmodsi4.c30
-rw-r--r--lib/udivmodti4.c4
-rw-r--r--lib/udivsi3.c4
-rw-r--r--lib/udivti3.c4
-rw-r--r--lib/umoddi3.c4
-rw-r--r--lib/umodsi3.c4
-rw-r--r--lib/umodti3.c4
-rw-r--r--lib/x86_64/floatundidf.S4
-rw-r--r--lib/x86_64/floatundisf.S4
-rw-r--r--lib/x86_64/floatundixf.S4
-rw-r--r--make/AppleBI.mk26
-rw-r--r--make/platform/clang_darwin.mk12
-rw-r--r--make/platform/darwin_bni.mk9
-rw-r--r--test/Unit/absvdi2_test.c4
-rw-r--r--test/Unit/absvsi2_test.c4
-rw-r--r--test/Unit/absvti2_test.c4
-rw-r--r--test/Unit/adddf3vfp_test.c4
-rw-r--r--test/Unit/addsf3vfp_test.c4
-rw-r--r--test/Unit/addvdi3_test.c4
-rw-r--r--test/Unit/addvsi3_test.c4
-rw-r--r--test/Unit/addvti3_test.c4
-rw-r--r--test/Unit/ashldi3_test.c4
-rw-r--r--test/Unit/ashlti3_test.c4
-rw-r--r--test/Unit/ashrdi3_test.c4
-rw-r--r--test/Unit/ashrti3_test.c4
-rw-r--r--test/Unit/bswapdi2_test.c4
-rw-r--r--test/Unit/bswapsi2_test.c4
-rw-r--r--test/Unit/clear_cache_test.c4
-rw-r--r--test/Unit/clzdi2_test.c4
-rw-r--r--test/Unit/clzsi2_test.c4
-rw-r--r--test/Unit/clzti2_test.c4
-rw-r--r--test/Unit/cmpdi2_test.c4
-rw-r--r--test/Unit/cmpti2_test.c4
-rw-r--r--test/Unit/comparedf2_test.c4
-rw-r--r--test/Unit/comparesf2_test.c4
-rw-r--r--test/Unit/ctzdi2_test.c4
-rw-r--r--test/Unit/ctzsi2_test.c4
-rw-r--r--test/Unit/ctzti2_test.c4
-rw-r--r--test/Unit/divdc3_test.c4
-rw-r--r--test/Unit/divdf3vfp_test.c4
-rw-r--r--test/Unit/divdi3_test.c4
-rw-r--r--test/Unit/divmodsi4_test.c73
-rw-r--r--test/Unit/divsc3_test.c4
-rw-r--r--test/Unit/divsf3vfp_test.c4
-rw-r--r--test/Unit/divsi3_test.c4
-rw-r--r--test/Unit/divtc3_test.c4
-rw-r--r--test/Unit/divti3_test.c4
-rw-r--r--test/Unit/divxc3_test.c4
-rw-r--r--test/Unit/enable_execute_stack_test.c4
-rw-r--r--test/Unit/endianness.h4
-rw-r--r--test/Unit/eqdf2vfp_test.c4
-rw-r--r--test/Unit/eqsf2vfp_test.c4
-rw-r--r--test/Unit/extebdsfdf2vfp_test.c4
-rw-r--r--test/Unit/ffsdi2_test.c4
-rw-r--r--test/Unit/ffsti2_test.c4
-rw-r--r--test/Unit/fixdfdi_test.c4
-rw-r--r--test/Unit/fixdfsivfp_test.c4
-rw-r--r--test/Unit/fixdfti_test.c4
-rw-r--r--test/Unit/fixsfdi_test.c4
-rw-r--r--test/Unit/fixsfsivfp_test.c4
-rw-r--r--test/Unit/fixsfti_test.c4
-rw-r--r--test/Unit/fixunsdfdi_test.c4
-rw-r--r--test/Unit/fixunsdfsi_test.c4
-rw-r--r--test/Unit/fixunsdfsivfp_test.c4
-rw-r--r--test/Unit/fixunsdfti_test.c4
-rw-r--r--test/Unit/fixunssfdi_test.c4
-rw-r--r--test/Unit/fixunssfsi_test.c4
-rw-r--r--test/Unit/fixunssfsivfp_test.c4
-rw-r--r--test/Unit/fixunssfti_test.c4
-rw-r--r--test/Unit/fixunstfdi_test.c4
-rw-r--r--test/Unit/fixunsxfdi_test.c4
-rw-r--r--test/Unit/fixunsxfsi_test.c4
-rw-r--r--test/Unit/fixunsxfti_test.c4
-rw-r--r--test/Unit/fixxfdi_test.c4
-rw-r--r--test/Unit/fixxfti_test.c4
-rw-r--r--test/Unit/floatdidf_test.c4
-rw-r--r--test/Unit/floatdisf_test.c4
-rw-r--r--test/Unit/floatdixf_test.c4
-rw-r--r--test/Unit/floatsidfvfp_test.c4
-rw-r--r--test/Unit/floatsisfvfp_test.c4
-rw-r--r--test/Unit/floattidf_test.c4
-rw-r--r--test/Unit/floattisf_test.c4
-rw-r--r--test/Unit/floattixf_test.c4
-rw-r--r--test/Unit/floatundidf_test.c4
-rw-r--r--test/Unit/floatundisf_test.c4
-rw-r--r--test/Unit/floatundixf_test.c4
-rw-r--r--test/Unit/floatunssidfvfp_test.c4
-rw-r--r--test/Unit/floatunssisfvfp_test.c4
-rw-r--r--test/Unit/floatuntidf_test.c4
-rw-r--r--test/Unit/floatuntisf_test.c4
-rw-r--r--test/Unit/floatuntixf_test.c4
-rw-r--r--test/Unit/gcc_personality_test.c4
-rw-r--r--test/Unit/gcc_personality_test_helper.cxx4
-rw-r--r--test/Unit/gedf2vfp_test.c4
-rw-r--r--test/Unit/gesf2vfp_test.c4
-rw-r--r--test/Unit/gtdf2vfp_test.c4
-rw-r--r--test/Unit/gtsf2vfp_test.c4
-rw-r--r--test/Unit/ledf2vfp_test.c4
-rw-r--r--test/Unit/lesf2vfp_test.c4
-rw-r--r--test/Unit/lshrdi3_test.c4
-rw-r--r--test/Unit/lshrti3_test.c4
-rw-r--r--test/Unit/ltdf2vfp_test.c4
-rw-r--r--test/Unit/ltsf2vfp_test.c4
-rw-r--r--test/Unit/moddi3_test.c4
-rw-r--r--test/Unit/modsi3_test.c4
-rw-r--r--test/Unit/modti3_test.c4
-rw-r--r--test/Unit/muldc3_test.c4
-rw-r--r--test/Unit/muldf3vfp_test.c4
-rw-r--r--test/Unit/muldi3_test.c4
-rw-r--r--test/Unit/mulsc3_test.c4
-rw-r--r--test/Unit/mulsf3vfp_test.c4
-rw-r--r--test/Unit/multc3_test.c4
-rw-r--r--test/Unit/multi3_test.c4
-rw-r--r--test/Unit/mulvdi3_test.c4
-rw-r--r--test/Unit/mulvsi3_test.c4
-rw-r--r--test/Unit/mulvti3_test.c4
-rw-r--r--test/Unit/mulxc3_test.c4
-rw-r--r--test/Unit/nedf2vfp_test.c4
-rw-r--r--test/Unit/negdf2vfp_test.c4
-rw-r--r--test/Unit/negdi2_test.c4
-rw-r--r--test/Unit/negsf2vfp_test.c4
-rw-r--r--test/Unit/negti2_test.c4
-rw-r--r--test/Unit/negvdi2_test.c4
-rw-r--r--test/Unit/negvsi2_test.c4
-rw-r--r--test/Unit/negvti2_test.c4
-rw-r--r--test/Unit/nesf2vfp_test.c4
-rw-r--r--test/Unit/paritydi2_test.c4
-rw-r--r--test/Unit/paritysi2_test.c4
-rw-r--r--test/Unit/parityti2_test.c4
-rw-r--r--test/Unit/popcountdi2_test.c4
-rw-r--r--test/Unit/popcountsi2_test.c4
-rw-r--r--test/Unit/popcountti2_test.c4
-rw-r--r--test/Unit/powidf2_test.c4
-rw-r--r--test/Unit/powisf2_test.c4
-rw-r--r--test/Unit/powitf2_test.c4
-rw-r--r--test/Unit/powixf2_test.c4
-rw-r--r--test/Unit/subdf3vfp_test.c4
-rw-r--r--test/Unit/subsf3vfp_test.c4
-rw-r--r--test/Unit/subvdi3_test.c4
-rw-r--r--test/Unit/subvsi3_test.c4
-rw-r--r--test/Unit/subvti3_test.c4
-rw-r--r--test/Unit/trampoline_setup_test.c4
-rw-r--r--test/Unit/truncdfsf2vfp_test.c4
-rw-r--r--test/Unit/ucmpdi2_test.c4
-rw-r--r--test/Unit/ucmpti2_test.c4
-rw-r--r--test/Unit/udivdi3_test.c4
-rw-r--r--test/Unit/udivmoddi4_test.c4
-rw-r--r--test/Unit/udivmodsi4_test.c59
-rw-r--r--test/Unit/udivmodti4_test.c4
-rw-r--r--test/Unit/udivsi3_test.c4
-rw-r--r--test/Unit/udivti3_test.c4
-rw-r--r--test/Unit/umoddi3_test.c4
-rw-r--r--test/Unit/umodsi3_test.c4
-rw-r--r--test/Unit/umodti3_test.c4
-rw-r--r--test/Unit/unorddf2vfp_test.c4
-rw-r--r--test/Unit/unordsf2vfp_test.c4
-rw-r--r--www/index.html6
339 files changed, 940 insertions, 703 deletions
diff --git a/CREDITS.TXT b/CREDITS.TXT
index 8b07b82bf87b..818f4fa104da 100644
--- a/CREDITS.TXT
+++ b/CREDITS.TXT
@@ -19,3 +19,6 @@ W: http://www.auroraux.org
D: CMake'ify Compiler-RT build system
D: Maintain Solaris & AuroraUX ports of Compiler-RT
+N: Howard Hinnant
+E: hhinnant@apple.com
+D: Architect and primary author of compiler-rt
diff --git a/LICENSE.TXT b/LICENSE.TXT
index a5e1345f673f..2552e8c2eb66 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,10 +1,21 @@
==============================================================================
-LLVM Release License
+compiler_rt License
==============================================================================
+
+The compiler_rt library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license. As a user of this code you may choose
+to use it under either license. As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
University of Illinois/NCSA
Open Source License
-Copyright (c) 2003-2009 University of Illinois at Urbana-Champaign.
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
All rights reserved.
Developed by:
@@ -43,21 +54,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
SOFTWARE.
==============================================================================
-Copyrights and Licenses for Third Party Software Distributed with LLVM:
-==============================================================================
-The LLVM software contains code written by third parties. Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the LLVM Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program Directory
-------- ---------
+
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.txt b/README.txt
index ab389d2129ba..cbeb10cf918e 100644
--- a/README.txt
+++ b/README.txt
@@ -77,8 +77,12 @@ ti_int __modti3 (ti_int a, ti_int b); // a % b signed
su_int __umodsi3 (su_int a, su_int b); // a % b unsigned
du_int __umoddi3 (du_int a, du_int b); // a % b unsigned
tu_int __umodti3 (tu_int a, tu_int b); // a % b unsigned
-du_int __udivmoddi4(du_int a, du_int b, du_int* rem); // a / b, *rem = a % b
-tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem); // a / b, *rem = a % b
+du_int __udivmoddi4(du_int a, du_int b, du_int* rem); // a / b, *rem = a % b unsigned
+tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem); // a / b, *rem = a % b unsigned
+su_int __udivmodsi4(su_int a, su_int b, su_int* rem); // a / b, *rem = a % b unsigned
+si_int __divmodsi4(si_int a, si_int b, si_int* rem); // a / b, *rem = a % b signed
+
+
// Integral arithmetic with trapping overflow
diff --git a/lib/absvdi2.c b/lib/absvdi2.c
index 919afd1351d3..2ba6687daa85 100644
--- a/lib/absvdi2.c
+++ b/lib/absvdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
*===----------------------------------------------------------------------===
*
diff --git a/lib/absvsi2.c b/lib/absvsi2.c
index a2c8e3f19052..ec5cf69e878d 100644
--- a/lib/absvsi2.c
+++ b/lib/absvsi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/absvti2.c b/lib/absvti2.c
index 0978122dceef..9e73a26b68ea 100644
--- a/lib/absvti2.c
+++ b/lib/absvti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/adddf3.c b/lib/adddf3.c
index 1ec43dcf58e2..c40135613dd6 100644
--- a/lib/adddf3.c
+++ b/lib/adddf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/addsf3.c b/lib/addsf3.c
index fec14e838518..c0e8d8e70dc8 100644
--- a/lib/addsf3.c
+++ b/lib/addsf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/addvdi3.c b/lib/addvdi3.c
index 53ab1024bd6f..ded023e07296 100644
--- a/lib/addvdi3.c
+++ b/lib/addvdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/addvsi3.c b/lib/addvsi3.c
index 22cd3154ce6c..7bdb39b97fe5 100644
--- a/lib/addvsi3.c
+++ b/lib/addvsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/addvti3.c b/lib/addvti3.c
index 3df1a742ce33..ba220f548096 100644
--- a/lib/addvti3.c
+++ b/lib/addvti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/apple_versioning.c b/lib/apple_versioning.c
index 0360026bceed..bb6302fbb4d0 100644
--- a/lib/apple_versioning.c
+++ b/lib/apple_versioning.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/lib/arm/adddf3vfp.S b/lib/arm/adddf3vfp.S
index 5e705e3c5796..cced1e09a3e0 100644
--- a/lib/arm/adddf3vfp.S
+++ b/lib/arm/adddf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/addsf3vfp.S b/lib/arm/addsf3vfp.S
index 36d509c1f52b..b747528de52b 100644
--- a/lib/arm/addsf3vfp.S
+++ b/lib/arm/addsf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/bswapdi2.S b/lib/arm/bswapdi2.S
index d3ca33a341c7..a0283e14e1e0 100644
--- a/lib/arm/bswapdi2.S
+++ b/lib/arm/bswapdi2.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/bswapsi2.S b/lib/arm/bswapsi2.S
index 0a0c073706ce..4c3af1f6d04d 100644
--- a/lib/arm/bswapsi2.S
+++ b/lib/arm/bswapsi2.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/comparesf2.S b/lib/arm/comparesf2.S
index f21e0bcd13f6..ee18203392dc 100644
--- a/lib/arm/comparesf2.S
+++ b/lib/arm/comparesf2.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/arm/divdf3vfp.S b/lib/arm/divdf3vfp.S
index e43baa373274..74ef0eabff73 100644
--- a/lib/arm/divdf3vfp.S
+++ b/lib/arm/divdf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/divsf3vfp.S b/lib/arm/divsf3vfp.S
index d96c930f8352..9eefcf31eba8 100644
--- a/lib/arm/divsf3vfp.S
+++ b/lib/arm/divsf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/eqdf2vfp.S b/lib/arm/eqdf2vfp.S
index d4384ec0e5ea..2998a76e021c 100644
--- a/lib/arm/eqdf2vfp.S
+++ b/lib/arm/eqdf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/eqsf2vfp.S b/lib/arm/eqsf2vfp.S
index 07355a3c2239..927566edd7af 100644
--- a/lib/arm/eqsf2vfp.S
+++ b/lib/arm/eqsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/extendsfdf2vfp.S b/lib/arm/extendsfdf2vfp.S
index 4343a7ef1ed4..b1aa88e2ae97 100644
--- a/lib/arm/extendsfdf2vfp.S
+++ b/lib/arm/extendsfdf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/fixdfsivfp.S b/lib/arm/fixdfsivfp.S
index 30458ccd59b3..0285a17e418b 100644
--- a/lib/arm/fixdfsivfp.S
+++ b/lib/arm/fixdfsivfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/fixsfsivfp.S b/lib/arm/fixsfsivfp.S
index ce6f18e1b90c..d05ba740aff7 100644
--- a/lib/arm/fixsfsivfp.S
+++ b/lib/arm/fixsfsivfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/fixunsdfsivfp.S b/lib/arm/fixunsdfsivfp.S
index 7e766c02a5e8..ddb703cdd608 100644
--- a/lib/arm/fixunsdfsivfp.S
+++ b/lib/arm/fixunsdfsivfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/fixunssfsivfp.S b/lib/arm/fixunssfsivfp.S
index ba2344f587e7..afbb64f395ec 100644
--- a/lib/arm/fixunssfsivfp.S
+++ b/lib/arm/fixunssfsivfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/floatsidfvfp.S b/lib/arm/floatsidfvfp.S
index 5ed4ace9b2c0..fe3366a904dd 100644
--- a/lib/arm/floatsidfvfp.S
+++ b/lib/arm/floatsidfvfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/floatsisfvfp.S b/lib/arm/floatsisfvfp.S
index 0114c789358a..5b416100a494 100644
--- a/lib/arm/floatsisfvfp.S
+++ b/lib/arm/floatsisfvfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/floatunssidfvfp.S b/lib/arm/floatunssidfvfp.S
index d1bfe3af5841..9b22a6f760d8 100644
--- a/lib/arm/floatunssidfvfp.S
+++ b/lib/arm/floatunssidfvfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/floatunssisfvfp.S b/lib/arm/floatunssisfvfp.S
index 0b73577b1067..44d5e938054a 100644
--- a/lib/arm/floatunssisfvfp.S
+++ b/lib/arm/floatunssisfvfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/gedf2vfp.S b/lib/arm/gedf2vfp.S
index 6ab856fe6f34..9993f52fb49d 100644
--- a/lib/arm/gedf2vfp.S
+++ b/lib/arm/gedf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/gesf2vfp.S b/lib/arm/gesf2vfp.S
index b00d82107dc3..9ce168259bbe 100644
--- a/lib/arm/gesf2vfp.S
+++ b/lib/arm/gesf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/gtdf2vfp.S b/lib/arm/gtdf2vfp.S
index 65594c7d3f92..8a049c8896fe 100644
--- a/lib/arm/gtdf2vfp.S
+++ b/lib/arm/gtdf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/gtsf2vfp.S b/lib/arm/gtsf2vfp.S
index 53ef2a00f804..1ffe1ec52acc 100644
--- a/lib/arm/gtsf2vfp.S
+++ b/lib/arm/gtsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/ledf2vfp.S b/lib/arm/ledf2vfp.S
index 327a7d5159f7..a04d0f2a4ad3 100644
--- a/lib/arm/ledf2vfp.S
+++ b/lib/arm/ledf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/lesf2vfp.S b/lib/arm/lesf2vfp.S
index b7e05da9b42b..301120047a71 100644
--- a/lib/arm/lesf2vfp.S
+++ b/lib/arm/lesf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/ltdf2vfp.S b/lib/arm/ltdf2vfp.S
index 55dfd808a3b8..87144a8c8152 100644
--- a/lib/arm/ltdf2vfp.S
+++ b/lib/arm/ltdf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/ltsf2vfp.S b/lib/arm/ltsf2vfp.S
index 3816a7123a64..ca06ae208985 100644
--- a/lib/arm/ltsf2vfp.S
+++ b/lib/arm/ltsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/modsi3.S b/lib/arm/modsi3.S
index 64a3afd9aa06..40ba856e3551 100644
--- a/lib/arm/modsi3.S
+++ b/lib/arm/modsi3.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/muldf3vfp.S b/lib/arm/muldf3vfp.S
index cb503d309121..96bba06c118d 100644
--- a/lib/arm/muldf3vfp.S
+++ b/lib/arm/muldf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/mulsf3vfp.S b/lib/arm/mulsf3vfp.S
index 49b4d1df9468..c56991d62e70 100644
--- a/lib/arm/mulsf3vfp.S
+++ b/lib/arm/mulsf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/nedf2vfp.S b/lib/arm/nedf2vfp.S
index 813864e88302..a02b09cc8079 100644
--- a/lib/arm/nedf2vfp.S
+++ b/lib/arm/nedf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/negdf2vfp.S b/lib/arm/negdf2vfp.S
index 8013975445ad..100f4fd5c829 100644
--- a/lib/arm/negdf2vfp.S
+++ b/lib/arm/negdf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/negsf2vfp.S b/lib/arm/negsf2vfp.S
index 243c0865c8cc..f96c8ad2b561 100644
--- a/lib/arm/negsf2vfp.S
+++ b/lib/arm/negsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/nesf2vfp.S b/lib/arm/nesf2vfp.S
index d470afa0ef7e..d6205497ae63 100644
--- a/lib/arm/nesf2vfp.S
+++ b/lib/arm/nesf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/restore_vfp_d8_d15_regs.S b/lib/arm/restore_vfp_d8_d15_regs.S
index 25404cd25076..7f441db5383b 100644
--- a/lib/arm/restore_vfp_d8_d15_regs.S
+++ b/lib/arm/restore_vfp_d8_d15_regs.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/save_vfp_d8_d15_regs.S b/lib/arm/save_vfp_d8_d15_regs.S
index 92de61bc6e8f..fbd21ba38358 100644
--- a/lib/arm/save_vfp_d8_d15_regs.S
+++ b/lib/arm/save_vfp_d8_d15_regs.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/softfloat-alias.list b/lib/arm/softfloat-alias.list
new file mode 100644
index 000000000000..cc6a4b3cdd2e
--- /dev/null
+++ b/lib/arm/softfloat-alias.list
@@ -0,0 +1,21 @@
+#
+# These are soft float functions which can be
+# aliased to the *vfp functions on arm processors
+# that support floating point instructions.
+#
+___adddf3vfp ___adddf3
+___addsf3vfp ___addsf3
+___divdf3vfp ___divdf3
+___divsf3vfp ___divsf3
+___extendsfdf2vfp ___extendsfdf2
+___fixdfsivfp ___fixdfsi
+___fixsfsivfp ___fixsfsi
+___floatsidfvfp ___floatsidf
+___floatsisfvfp ___floatsisf
+___muldf3vfp ___muldf3
+___mulsf3vfp ___mulsf3
+___subdf3vfp ___subdf3
+___subsf3vfp ___subsf3
+___truncdfsf2vfp ___truncdfsf2
+___floatunssidfvfp ___floatunsidf
+___floatunssisfvfp ___floatunsisf
diff --git a/lib/arm/subdf3vfp.S b/lib/arm/subdf3vfp.S
index 88416006a061..ff53b3000d13 100644
--- a/lib/arm/subdf3vfp.S
+++ b/lib/arm/subdf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/subsf3vfp.S b/lib/arm/subsf3vfp.S
index 4ead9c23e712..238f3f047450 100644
--- a/lib/arm/subsf3vfp.S
+++ b/lib/arm/subsf3vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/switch16.S b/lib/arm/switch16.S
index 05c7b98b01ab..e8f08c49c5df 100644
--- a/lib/arm/switch16.S
+++ b/lib/arm/switch16.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/switch32.S b/lib/arm/switch32.S
index a127cb79f534..7008fccb18ee 100644
--- a/lib/arm/switch32.S
+++ b/lib/arm/switch32.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/switch8.S b/lib/arm/switch8.S
index d05f6ac7f068..e784b4082e1f 100644
--- a/lib/arm/switch8.S
+++ b/lib/arm/switch8.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/switchu8.S b/lib/arm/switchu8.S
index faffddb50c1e..19bed2f664d7 100644
--- a/lib/arm/switchu8.S
+++ b/lib/arm/switchu8.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/sync_synchronize.S b/lib/arm/sync_synchronize.S
index 76fdab1fbdb2..06dade964728 100644
--- a/lib/arm/sync_synchronize.S
+++ b/lib/arm/sync_synchronize.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/truncdfsf2vfp.S b/lib/arm/truncdfsf2vfp.S
index 5725e25c76a7..6e55c7ffb52c 100644
--- a/lib/arm/truncdfsf2vfp.S
+++ b/lib/arm/truncdfsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/unorddf2vfp.S b/lib/arm/unorddf2vfp.S
index de00b07feef9..9b52131e4bcc 100644
--- a/lib/arm/unorddf2vfp.S
+++ b/lib/arm/unorddf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/arm/unordsf2vfp.S b/lib/arm/unordsf2vfp.S
index ab291a858dab..e486533e2ad9 100644
--- a/lib/arm/unordsf2vfp.S
+++ b/lib/arm/unordsf2vfp.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/ashldi3.c b/lib/ashldi3.c
index 993f71ca9724..1067e6fc61c0 100644
--- a/lib/ashldi3.c
+++ b/lib/ashldi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ashlti3.c b/lib/ashlti3.c
index 317de6655956..7042b53b9562 100644
--- a/lib/ashlti3.c
+++ b/lib/ashlti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ashrdi3.c b/lib/ashrdi3.c
index 8e27a11a7523..94d46f1b4622 100644
--- a/lib/ashrdi3.c
+++ b/lib/ashrdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ashrti3.c b/lib/ashrti3.c
index 4eab2475c133..4d16230273d9 100644
--- a/lib/ashrti3.c
+++ b/lib/ashrti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/assembly.h b/lib/assembly.h
index c2d5a34fffb0..41c24d74ead3 100644
--- a/lib/assembly.h
+++ b/lib/assembly.h
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/clear_cache.c b/lib/clear_cache.c
index ddc48bcc56e3..099b76ea4e30 100644
--- a/lib/clear_cache.c
+++ b/lib/clear_cache.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/lib/clzdi2.c b/lib/clzdi2.c
index ea953961de09..213277712acc 100644
--- a/lib/clzdi2.c
+++ b/lib/clzdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/clzsi2.c b/lib/clzsi2.c
index 7e14af293701..d99047dec485 100644
--- a/lib/clzsi2.c
+++ b/lib/clzsi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/clzti2.c b/lib/clzti2.c
index 805688fbe223..7a650eb42544 100644
--- a/lib/clzti2.c
+++ b/lib/clzti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/cmpdi2.c b/lib/cmpdi2.c
index 0b8735244ca6..04bd7cf62461 100644
--- a/lib/cmpdi2.c
+++ b/lib/cmpdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/cmpti2.c b/lib/cmpti2.c
index 90b3b75638b7..b156fce90bfa 100644
--- a/lib/cmpti2.c
+++ b/lib/cmpti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/comparedf2.c b/lib/comparedf2.c
index 5c5ee9d65bf2..fe35fd80aadd 100644
--- a/lib/comparedf2.c
+++ b/lib/comparedf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/comparesf2.c b/lib/comparesf2.c
index fd0572401117..3f2e358addb5 100644
--- a/lib/comparesf2.c
+++ b/lib/comparesf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/ctzdi2.c b/lib/ctzdi2.c
index b49f2c713534..f7ae50fdf09e 100644
--- a/lib/ctzdi2.c
+++ b/lib/ctzdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ctzsi2.c b/lib/ctzsi2.c
index 30d34c862509..0c738fa591cc 100644
--- a/lib/ctzsi2.c
+++ b/lib/ctzsi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ctzti2.c b/lib/ctzti2.c
index f2d41fee1cb8..1c9508fd5524 100644
--- a/lib/ctzti2.c
+++ b/lib/ctzti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divdc3.c b/lib/divdc3.c
index c96aefd0e49d..5f6329856bf3 100644
--- a/lib/divdc3.c
+++ b/lib/divdc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divdf3.c b/lib/divdf3.c
index 21b8f09bacb0..217d284bf814 100644
--- a/lib/divdf3.c
+++ b/lib/divdf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/divdi3.c b/lib/divdi3.c
index fccfb8b09a09..a1b83ea3ecec 100644
--- a/lib/divdi3.c
+++ b/lib/divdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divmodsi4.c b/lib/divmodsi4.c
new file mode 100644
index 000000000000..2ec3dd4a7e5a
--- /dev/null
+++ b/lib/divmodsi4.c
@@ -0,0 +1,30 @@
+/*===-- divmodsi4.c - Implement __divmodsi4 --------------------------------===
+ *
+ * The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __divmodsi4 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+extern si_int __divsi3(si_int a, si_int b);
+
+
+/* Returns: a / b, *rem = a % b */
+
+si_int
+__divmodsi4(si_int a, si_int b, si_int* rem)
+{
+ si_int d = __divsi3(a,b);
+ *rem = a - (d*b);
+ return d;
+}
+
+
diff --git a/lib/divsc3.c b/lib/divsc3.c
index c38c8638efb0..a05f42902c0e 100644
--- a/lib/divsc3.c
+++ b/lib/divsc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divsf3.c b/lib/divsf3.c
index 03b7311788bc..b798cfb03c0d 100644
--- a/lib/divsf3.c
+++ b/lib/divsf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/divsi3.c b/lib/divsi3.c
index 0eff6ef0d735..c48ecf45dbc1 100644
--- a/lib/divsi3.c
+++ b/lib/divsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divti3.c b/lib/divti3.c
index c752f6cfbe9d..4ec3fa35ec58 100644
--- a/lib/divti3.c
+++ b/lib/divti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/divxc3.c b/lib/divxc3.c
index 03357ae552c3..f054d4028392 100644
--- a/lib/divxc3.c
+++ b/lib/divxc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/enable_execute_stack.c b/lib/enable_execute_stack.c
index 193e7dbc23bc..7ab8e8d4155c 100644
--- a/lib/enable_execute_stack.c
+++ b/lib/enable_execute_stack.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/lib/endianness.h b/lib/endianness.h
index 6d2587d022e3..9b7e7c1f09c4 100644
--- a/lib/endianness.h
+++ b/lib/endianness.h
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/eprintf.c b/lib/eprintf.c
index 786fe6aaa672..7c79174fcb57 100644
--- a/lib/eprintf.c
+++ b/lib/eprintf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/lib/extendsfdf2.c b/lib/extendsfdf2.c
index 025eb9572446..db65acf97b28 100644
--- a/lib/extendsfdf2.c
+++ b/lib/extendsfdf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/ffsdi2.c b/lib/ffsdi2.c
index 8c03d19afcc6..8a1c68cb3234 100644
--- a/lib/ffsdi2.c
+++ b/lib/ffsdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ffsti2.c b/lib/ffsti2.c
index 0139eb1f7576..948c696b6a10 100644
--- a/lib/ffsti2.c
+++ b/lib/ffsti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixdfdi.c b/lib/fixdfdi.c
index 3d3116c1811b..3a760ff24977 100644
--- a/lib/fixdfdi.c
+++ b/lib/fixdfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixdfsi.c b/lib/fixdfsi.c
index 7d17aeddeb48..98062abce4bb 100644
--- a/lib/fixdfsi.c
+++ b/lib/fixdfsi.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/fixdfti.c b/lib/fixdfti.c
index 359b84eaecef..4140d144618a 100644
--- a/lib/fixdfti.c
+++ b/lib/fixdfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixsfdi.c b/lib/fixsfdi.c
index 08f1524e152a..1a85306520b2 100644
--- a/lib/fixsfdi.c
+++ b/lib/fixsfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixsfsi.c b/lib/fixsfsi.c
index ff79377198f4..b68471d7c6ba 100644
--- a/lib/fixsfsi.c
+++ b/lib/fixsfsi.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/fixsfti.c b/lib/fixsfti.c
index 95992fe3f48e..c64e5aea5845 100644
--- a/lib/fixsfti.c
+++ b/lib/fixsfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsdfdi.c b/lib/fixunsdfdi.c
index bdcee13e80ba..1c78e2bb136a 100644
--- a/lib/fixunsdfdi.c
+++ b/lib/fixunsdfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsdfsi.c b/lib/fixunsdfsi.c
index a0cba79aabb9..e0298915660f 100644
--- a/lib/fixunsdfsi.c
+++ b/lib/fixunsdfsi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsdfti.c b/lib/fixunsdfti.c
index c1cd72deca2f..524a2078fa46 100644
--- a/lib/fixunsdfti.c
+++ b/lib/fixunsdfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunssfdi.c b/lib/fixunssfdi.c
index 3837bd890e69..3b1bc4af948f 100644
--- a/lib/fixunssfdi.c
+++ b/lib/fixunssfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunssfsi.c b/lib/fixunssfsi.c
index a001cd48196b..023d7b2445d5 100644
--- a/lib/fixunssfsi.c
+++ b/lib/fixunssfsi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunssfti.c b/lib/fixunssfti.c
index 20b7e760547a..b807910177a0 100644
--- a/lib/fixunssfti.c
+++ b/lib/fixunssfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsxfdi.c b/lib/fixunsxfdi.c
index 872727bcd3df..6c817d8e1289 100644
--- a/lib/fixunsxfdi.c
+++ b/lib/fixunsxfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsxfsi.c b/lib/fixunsxfsi.c
index c9a607ace6d0..b9da86c4f8ea 100644
--- a/lib/fixunsxfsi.c
+++ b/lib/fixunsxfsi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixunsxfti.c b/lib/fixunsxfti.c
index d0bd512c4d41..f0e16dbfe4dd 100644
--- a/lib/fixunsxfti.c
+++ b/lib/fixunsxfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixxfdi.c b/lib/fixxfdi.c
index de6f818b8cda..9592ce43025b 100644
--- a/lib/fixxfdi.c
+++ b/lib/fixxfdi.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fixxfti.c b/lib/fixxfti.c
index c2248016c85c..1022770f1147 100644
--- a/lib/fixxfti.c
+++ b/lib/fixxfti.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatdidf.c b/lib/floatdidf.c
index a0f501b60fff..cad354a57fc9 100644
--- a/lib/floatdidf.c
+++ b/lib/floatdidf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
*===----------------------------------------------------------------------===
*
diff --git a/lib/floatdisf.c b/lib/floatdisf.c
index 1925f1588c5d..71d603b568f7 100644
--- a/lib/floatdisf.c
+++ b/lib/floatdisf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
*===----------------------------------------------------------------------===
*
diff --git a/lib/floatdixf.c b/lib/floatdixf.c
index bfda367dfeca..ebf62dba0584 100644
--- a/lib/floatdixf.c
+++ b/lib/floatdixf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatsidf.c b/lib/floatsidf.c
index a13ab8fbcfb5..85facea1632c 100644
--- a/lib/floatsidf.c
+++ b/lib/floatsidf.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/floatsisf.c b/lib/floatsisf.c
index 4a629755e783..d1bb46076477 100644
--- a/lib/floatsisf.c
+++ b/lib/floatsisf.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/floattidf.c b/lib/floattidf.c
index 274f58517c4e..f61844d5e59e 100644
--- a/lib/floattidf.c
+++ b/lib/floattidf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floattisf.c b/lib/floattisf.c
index 72f37481b3a2..7eb761d7ab2a 100644
--- a/lib/floattisf.c
+++ b/lib/floattisf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floattixf.c b/lib/floattixf.c
index 77d906049be6..e4bcb5ff0092 100644
--- a/lib/floattixf.c
+++ b/lib/floattixf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatundidf.c b/lib/floatundidf.c
index 1f304c5c3535..506fc3c4be7b 100644
--- a/lib/floatundidf.c
+++ b/lib/floatundidf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatundisf.c b/lib/floatundisf.c
index 79b4b82e3a03..55e40230ecb3 100644
--- a/lib/floatundisf.c
+++ b/lib/floatundisf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatundixf.c b/lib/floatundixf.c
index bc9582f7604f..64f7662d9525 100644
--- a/lib/floatundixf.c
+++ b/lib/floatundixf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatunsidf.c b/lib/floatunsidf.c
index 05242c18ab37..0f473aa1aadd 100644
--- a/lib/floatunsidf.c
+++ b/lib/floatunsidf.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/floatunsisf.c b/lib/floatunsisf.c
index 31c064432908..48eff93a2fc3 100644
--- a/lib/floatunsisf.c
+++ b/lib/floatunsisf.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/floatuntidf.c b/lib/floatuntidf.c
index 51d8b2827a36..bab7483d99e0 100644
--- a/lib/floatuntidf.c
+++ b/lib/floatuntidf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatuntisf.c b/lib/floatuntisf.c
index 328f39bbef78..0ab6d7e56f58 100644
--- a/lib/floatuntisf.c
+++ b/lib/floatuntisf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/floatuntixf.c b/lib/floatuntixf.c
index e82d0c1e6ff4..a84709aef60b 100644
--- a/lib/floatuntixf.c
+++ b/lib/floatuntixf.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/fp_lib.h b/lib/fp_lib.h
index eac670d7f236..6c9455ace0e6 100644
--- a/lib/fp_lib.h
+++ b/lib/fp_lib.h
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/gcc_personality_v0.c b/lib/gcc_personality_v0.c
index 59401900ef85..c840eef4842a 100644
--- a/lib/gcc_personality_v0.c
+++ b/lib/gcc_personality_v0.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/i386/ashldi3.S b/lib/i386/ashldi3.S
index af6f98bc7cf8..5488ad6e52be 100644
--- a/lib/i386/ashldi3.S
+++ b/lib/i386/ashldi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/ashrdi3.S b/lib/i386/ashrdi3.S
index 346f9b1adc16..b1445ddb99c1 100644
--- a/lib/i386/ashrdi3.S
+++ b/lib/i386/ashrdi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/divdi3.S b/lib/i386/divdi3.S
index 5ad530c34a4f..69593e32e9e3 100644
--- a/lib/i386/divdi3.S
+++ b/lib/i386/divdi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/floatdidf.S b/lib/i386/floatdidf.S
index 3a526eab9f96..a953d26cec06 100644
--- a/lib/i386/floatdidf.S
+++ b/lib/i386/floatdidf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/floatdisf.S b/lib/i386/floatdisf.S
index 741e4a6607fc..a98a46ee33ab 100644
--- a/lib/i386/floatdisf.S
+++ b/lib/i386/floatdisf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/floatdixf.S b/lib/i386/floatdixf.S
index f0271abcbdc2..412976fb41b1 100644
--- a/lib/i386/floatdixf.S
+++ b/lib/i386/floatdixf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/floatundidf.S b/lib/i386/floatundidf.S
index 7186a355d96c..6bba7e1cf72a 100644
--- a/lib/i386/floatundidf.S
+++ b/lib/i386/floatundidf.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/i386/floatundisf.S b/lib/i386/floatundisf.S
index 070820c9d4d2..1afd1d4d05b3 100644
--- a/lib/i386/floatundisf.S
+++ b/lib/i386/floatundisf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/floatundixf.S b/lib/i386/floatundixf.S
index 2cf6d5c2a6ee..6e6710bd4ac6 100644
--- a/lib/i386/floatundixf.S
+++ b/lib/i386/floatundixf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/lshrdi3.S b/lib/i386/lshrdi3.S
index 74937d2d8c16..cf411f22e0be 100644
--- a/lib/i386/lshrdi3.S
+++ b/lib/i386/lshrdi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/moddi3.S b/lib/i386/moddi3.S
index 85f5b3811d5c..8839cfc51d95 100644
--- a/lib/i386/moddi3.S
+++ b/lib/i386/moddi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/muldi3.S b/lib/i386/muldi3.S
index 5f99f6a9ea82..e56a3553bd31 100644
--- a/lib/i386/muldi3.S
+++ b/lib/i386/muldi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/udivdi3.S b/lib/i386/udivdi3.S
index 77936f858ac6..5abeaeaaf476 100644
--- a/lib/i386/udivdi3.S
+++ b/lib/i386/udivdi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/i386/umoddi3.S b/lib/i386/umoddi3.S
index 3cf8aeb62b28..7fd84853b5b2 100644
--- a/lib/i386/umoddi3.S
+++ b/lib/i386/umoddi3.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/int_lib.h b/lib/int_lib.h
index 912a12f5937c..e1fd6b73dc7f 100644
--- a/lib/int_lib.h
+++ b/lib/int_lib.h
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
@@ -20,6 +20,7 @@
/* Assumption: right shift of signed negative is arithmetic shift */
#include <limits.h>
+#include <stdint.h>
#include "endianness.h"
#include <math.h>
diff --git a/lib/lshrdi3.c b/lib/lshrdi3.c
index 57484ee750af..84525b78a1a8 100644
--- a/lib/lshrdi3.c
+++ b/lib/lshrdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/lshrti3.c b/lib/lshrti3.c
index 3272c9ca831a..5fdd99eb7703 100644
--- a/lib/lshrti3.c
+++ b/lib/lshrti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/moddi3.c b/lib/moddi3.c
index 453355596825..3b350ddc3fb9 100644
--- a/lib/moddi3.c
+++ b/lib/moddi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/modsi3.c b/lib/modsi3.c
index c9214a24f39b..70d38a6b5d59 100644
--- a/lib/modsi3.c
+++ b/lib/modsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
@@ -14,10 +14,12 @@
#include "int_lib.h"
+su_int __divsi3(si_int a, si_int b);
+
/* Returns: a % b */
si_int
__modsi3(si_int a, si_int b)
{
- return a - (a / b) * b;
+ return a - __divsi3(a, b) * b;
}
diff --git a/lib/modti3.c b/lib/modti3.c
index 75d688ef0a63..dbe5e949b9da 100644
--- a/lib/modti3.c
+++ b/lib/modti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/muldc3.c b/lib/muldc3.c
index c048d84faa1f..9f9bd2aaa2bb 100644
--- a/lib/muldc3.c
+++ b/lib/muldc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/muldf3.c b/lib/muldf3.c
index 63a473e88d21..85672e584436 100644
--- a/lib/muldf3.c
+++ b/lib/muldf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/muldi3.c b/lib/muldi3.c
index 38963b72630d..43637324bae8 100644
--- a/lib/muldi3.c
+++ b/lib/muldi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/mulsc3.c b/lib/mulsc3.c
index c7b9f6417269..a878ba1f39b2 100644
--- a/lib/mulsc3.c
+++ b/lib/mulsc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/mulsf3.c b/lib/mulsf3.c
index 6bd2f9dcae50..dd4ce11a0897 100644
--- a/lib/mulsf3.c
+++ b/lib/mulsf3.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/multi3.c b/lib/multi3.c
index 13a386781a9a..ad8ab3fcbcb4 100644
--- a/lib/multi3.c
+++ b/lib/multi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
diff --git a/lib/mulvdi3.c b/lib/mulvdi3.c
index 295ae18d3c85..fcbb5b3f6eef 100644
--- a/lib/mulvdi3.c
+++ b/lib/mulvdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/mulvsi3.c b/lib/mulvsi3.c
index b4a509be2093..6271cd44a3c2 100644
--- a/lib/mulvsi3.c
+++ b/lib/mulvsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/mulvti3.c b/lib/mulvti3.c
index 778222ee6c96..7da9187ffc7d 100644
--- a/lib/mulvti3.c
+++ b/lib/mulvti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/mulxc3.c b/lib/mulxc3.c
index 94895f2551fd..b5ae86554805 100644
--- a/lib/mulxc3.c
+++ b/lib/mulxc3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/negdf2.c b/lib/negdf2.c
index 527b068a17a8..aeae2e8a344c 100644
--- a/lib/negdf2.c
+++ b/lib/negdf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/negdi2.c b/lib/negdi2.c
index 707b0dd78255..b000dda3b83d 100644
--- a/lib/negdi2.c
+++ b/lib/negdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/negsf2.c b/lib/negsf2.c
index 5e91e87e9888..d211f7cc89b2 100644
--- a/lib/negsf2.c
+++ b/lib/negsf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/negti2.c b/lib/negti2.c
index 6ce6a0403acc..774e80829454 100644
--- a/lib/negti2.c
+++ b/lib/negti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/negvdi2.c b/lib/negvdi2.c
index 0baf377400e6..2851d26f4798 100644
--- a/lib/negvdi2.c
+++ b/lib/negvdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/negvsi2.c b/lib/negvsi2.c
index e5a36a5dacf5..1a8334760595 100644
--- a/lib/negvsi2.c
+++ b/lib/negvsi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/negvti2.c b/lib/negvti2.c
index d56e1e32ade1..d93130542b0c 100644
--- a/lib/negvti2.c
+++ b/lib/negvti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
*===----------------------------------------------------------------------===
*
diff --git a/lib/paritydi2.c b/lib/paritydi2.c
index 90e5559bc799..9d349b8c2416 100644
--- a/lib/paritydi2.c
+++ b/lib/paritydi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/paritysi2.c b/lib/paritysi2.c
index ba05782a2a7e..76de328e1eab 100644
--- a/lib/paritysi2.c
+++ b/lib/paritysi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/parityti2.c b/lib/parityti2.c
index 650d417936af..8f857455a7b2 100644
--- a/lib/parityti2.c
+++ b/lib/parityti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/popcountdi2.c b/lib/popcountdi2.c
index 78b6d88d7311..0778a66c81df 100644
--- a/lib/popcountdi2.c
+++ b/lib/popcountdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/popcountsi2.c b/lib/popcountsi2.c
index 4f092ee4017c..e425b0b86388 100644
--- a/lib/popcountsi2.c
+++ b/lib/popcountsi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/popcountti2.c b/lib/popcountti2.c
index 16f89b7abab8..68d94270792f 100644
--- a/lib/popcountti2.c
+++ b/lib/popcountti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/powidf2.c b/lib/powidf2.c
index 37972b68b6ea..0200e1eab0b5 100644
--- a/lib/powidf2.c
+++ b/lib/powidf2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/powisf2.c b/lib/powisf2.c
index ace08c266752..c834b9696954 100644
--- a/lib/powisf2.c
+++ b/lib/powisf2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/powitf2.c b/lib/powitf2.c
index 3dacbf6bfc2a..189632cf6304 100644
--- a/lib/powitf2.c
+++ b/lib/powitf2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/powixf2.c b/lib/powixf2.c
index 1a816e9131cb..f050964d3597 100644
--- a/lib/powixf2.c
+++ b/lib/powixf2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ppc/restFP.S b/lib/ppc/restFP.S
index 00919c8cdce4..95032897c0da 100644
--- a/lib/ppc/restFP.S
+++ b/lib/ppc/restFP.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/ppc/saveFP.S b/lib/ppc/saveFP.S
index 302da6e9c595..72bd459f4cc0 100644
--- a/lib/ppc/saveFP.S
+++ b/lib/ppc/saveFP.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/lib/subvdi3.c b/lib/subvdi3.c
index e4926b816460..17f55d00059e 100644
--- a/lib/subvdi3.c
+++ b/lib/subvdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/subvsi3.c b/lib/subvsi3.c
index ce39c815b86e..51bb454475aa 100644
--- a/lib/subvsi3.c
+++ b/lib/subvsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/subvti3.c b/lib/subvti3.c
index 55b7925a14b3..5d693dc9aba4 100644
--- a/lib/subvti3.c
+++ b/lib/subvti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/trampoline_setup.c b/lib/trampoline_setup.c
index 8254e362a7d7..ced119fb5833 100644
--- a/lib/trampoline_setup.c
+++ b/lib/trampoline_setup.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/lib/truncdfsf2.c b/lib/truncdfsf2.c
index d289cb989186..92609fb784c9 100644
--- a/lib/truncdfsf2.c
+++ b/lib/truncdfsf2.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/ucmpdi2.c b/lib/ucmpdi2.c
index d2900cae4368..ead726723aa5 100644
--- a/lib/ucmpdi2.c
+++ b/lib/ucmpdi2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/ucmpti2.c b/lib/ucmpti2.c
index 0e7eea3e3d1c..11137c5a5ee0 100644
--- a/lib/ucmpti2.c
+++ b/lib/ucmpti2.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/udivdi3.c b/lib/udivdi3.c
index 25d1df643c91..642f2fb9c251 100644
--- a/lib/udivdi3.c
+++ b/lib/udivdi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/udivmoddi4.c b/lib/udivmoddi4.c
index 92742302cf68..693736fb8cd2 100644
--- a/lib/udivmoddi4.c
+++ b/lib/udivmoddi4.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/udivmodsi4.c b/lib/udivmodsi4.c
new file mode 100644
index 000000000000..38b5bd43de67
--- /dev/null
+++ b/lib/udivmodsi4.c
@@ -0,0 +1,30 @@
+/*===-- udivmodsi4.c - Implement __udivmodsi4 ------------------------------===
+ *
+ * The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __udivmodsi4 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+extern su_int __udivsi3(su_int n, su_int d);
+
+
+/* Returns: a / b, *rem = a % b */
+
+su_int
+__udivmodsi4(su_int a, su_int b, su_int* rem)
+{
+ si_int d = __udivsi3(a,b);
+ *rem = a - (d*b);
+ return d;
+}
+
+
diff --git a/lib/udivmodti4.c b/lib/udivmodti4.c
index 53b407256e67..d1e19edd4c3b 100644
--- a/lib/udivmodti4.c
+++ b/lib/udivmodti4.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/udivsi3.c b/lib/udivsi3.c
index 70528b66e2b4..476f2bc310b9 100644
--- a/lib/udivsi3.c
+++ b/lib/udivsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/udivti3.c b/lib/udivti3.c
index fb810fda5fae..7405a0f98656 100644
--- a/lib/udivti3.c
+++ b/lib/udivti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/umoddi3.c b/lib/umoddi3.c
index 807bb5cec622..adb4b0e75dff 100644
--- a/lib/umoddi3.c
+++ b/lib/umoddi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/umodsi3.c b/lib/umodsi3.c
index ead7737587a8..d3aaaeae0008 100644
--- a/lib/umodsi3.c
+++ b/lib/umodsi3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/umodti3.c b/lib/umodti3.c
index 6c8a7581aeea..8f20c5fe35b9 100644
--- a/lib/umodti3.c
+++ b/lib/umodti3.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/lib/x86_64/floatundidf.S b/lib/x86_64/floatundidf.S
index 6e684b2a4cab..1be553b7d1e0 100644
--- a/lib/x86_64/floatundidf.S
+++ b/lib/x86_64/floatundidf.S
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/lib/x86_64/floatundisf.S b/lib/x86_64/floatundisf.S
index fe209632a38e..89d3f07dfcc6 100644
--- a/lib/x86_64/floatundisf.S
+++ b/lib/x86_64/floatundisf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/lib/x86_64/floatundixf.S b/lib/x86_64/floatundixf.S
index 246f0266c8a1..a7243f2c545a 100644
--- a/lib/x86_64/floatundixf.S
+++ b/lib/x86_64/floatundixf.S
@@ -1,5 +1,5 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
#include "../assembly.h"
diff --git a/make/AppleBI.mk b/make/AppleBI.mk
index 8cbce5fbaf56..184c16ad84e9 100644
--- a/make/AppleBI.mk
+++ b/make/AppleBI.mk
@@ -14,8 +14,14 @@ endif
ifeq (,$(SDKROOT))
INSTALL_TARGET = install-MacOSX
+ LD_OTHER_FLAGS =
else
INSTALL_TARGET = install-iOS
+ CFLAGS.Release.armv6 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT)
+ CFLAGS.Release.armv7 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT)
+ CFLAGS.Static.armv6 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT)
+ CFLAGS.Static.armv7 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT)
+ LD_OTHER_FLAGS = -Wl,-alias_list,$(SRCROOT)/lib/arm/softfloat-alias.list -isysroot $(SDKROOT)
endif
@@ -48,11 +54,11 @@ install-MacOSX : $(SYMROOT)/libcompiler_rt.dylib
# Rule to make each dylib slice
$(OBJROOT)/libcompiler_rt-%.dylib : $(OBJROOT)/darwin_bni/Release/%/libcompiler_rt.a
echo "const char vers[] = \"@(#) $(RC_ProjectName)-$(RC_ProjectSourceVersion)\"; " > $(OBJROOT)/version.c
- cc $(OBJROOT)/version.c -arch $* -dynamiclib \
+ $(CC.Release) $(OBJROOT)/version.c -arch $* -dynamiclib \
-install_name /usr/lib/system/libcompiler_rt.dylib \
-compatibility_version 1 -current_version $(RC_ProjectSourceVersion) \
-nodefaultlibs -lSystem -umbrella System -dead_strip \
- -Wl,-force_load,$^ -o $@
+ $(LD_OTHER_FLAGS) -Wl,-force_load,$^ -o $@
# Rule to make fat dylib
$(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \
@@ -63,19 +69,15 @@ $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \
# Copy results to DSTROOT.
-install-iOS: $(SYMROOT)/libcompiler_rt.a $(SYMROOT)/libcompiler_rt-static.a
- mkdir -p $(DSTROOT)/usr/local/lib/libgcc
- cp $(SYMROOT)/libcompiler_rt.a \
- $(DSTROOT)/usr/local/lib/libgcc/libcompiler_rt.a
- mkdir -p $(DSTROOT)/usr/local/
+install-iOS: $(SYMROOT)/libcompiler_rt-static.a \
+ $(SYMROOT)/libcompiler_rt.dylib
+ mkdir -p $(DSTROOT)/usr/local/lib
cp $(SYMROOT)/libcompiler_rt-static.a \
$(DSTROOT)/usr/local/lib/libcompiler_rt-static.a
+ mkdir -p $(DSTROOT)/usr/lib/system
+ strip -S $(SYMROOT)/libcompiler_rt.dylib \
+ -o $(DSTROOT)/usr/lib/system/libcompiler_rt.dylib
-
-# Rule to make fat archive
-$(SYMROOT)/libcompiler_rt.a : $(foreach arch,$(RC_ARCHS), \
- $(OBJROOT)/darwin_bni/Release/$(arch)/libcompiler_rt.a)
- lipo -create $^ -o $@
# Rule to make fat archive
$(SYMROOT)/libcompiler_rt-static.a : $(foreach arch,$(RC_ARCHS), \
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 23cd3a42f86a..a29793991ebb 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -28,11 +28,7 @@ UniversalArchs.armv6 := armv6
# Configuration for use with kernel/kexts.
Configs += cc_kext
-UniversalArchs.cc_kext := armv6 i386 x86_64
-
-# FIXME: Don't build an armv7 slice currently, they have the same functions.
-#
-#UniversalArchs.cc_kext := armv6 armv7 i386 x86_64
+UniversalArchs.cc_kext := armv6 armv7 i386 x86_64
###
@@ -58,7 +54,6 @@ CCKEXT_COMMON_FUNCTIONS := \
ashrdi3 \
bswapdi2 \
bswapsi2 \
- clear_cache \
clzdi2 \
clzsi2 \
cmpdi2 \
@@ -105,7 +100,7 @@ CCKEXT_COMMON_FUNCTIONS := \
udivmoddi4 \
umoddi3
-CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTONS) \
+CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTIONS) \
adddf3 \
addsf3 \
aeabi_cdcmpeq \
@@ -164,6 +159,9 @@ CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTONS) \
FUNCTIONS.cc_kext.armv6 := $(CCKEXT_ARM_FUNCTIONS)
FUNCTIONS.cc_kext.armv7 := $(CCKEXT_ARM_FUNCTIONS)
+CFLAGS.cc_kext.armv6 := $(CFLAGS) -mthumb
+CFLAGS.cc_kext.armv7 := $(CFLAGS) -mthumb
+
CCKEXT_X86_FUNCTIONS := $(CCKEXT_COMMON_FUNCTIONS) \
divxc3 \
fixunsxfdi \
diff --git a/make/platform/darwin_bni.mk b/make/platform/darwin_bni.mk
index ec859f3b5d6e..f15334f31943 100644
--- a/make/platform/darwin_bni.mk
+++ b/make/platform/darwin_bni.mk
@@ -61,10 +61,10 @@ FUNCTIONS.armv5 := $(FUNCTIONS) \
muldf3 mulsf3 \
negdf2 negsf2 \
truncdfsf2 \
- modsi3 umodsi3 udivsi3 divsi3 \
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
switch8 switchu8 switch16 switch32 \
sync_synchronize
-
+
FUNCTIONS.armv6 := $(FUNCTIONS) \
comparedf2 comparesf2 \
adddf3vfp addsf3vfp bswapdi2 bswapsi2 divdf3vfp \
@@ -76,10 +76,11 @@ FUNCTIONS.armv6 := $(FUNCTIONS) \
muldf3vfp mulsf3vfp \
nedf2vfp nesf2vfp \
subdf3vfp subsf3vfp truncdfsf2vfp unorddf2vfp unordsf2vfp \
- modsi3 umodsi3 udivsi3 divsi3 \
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
switch8 switchu8 switch16 switch32 \
restore_vfp_d8_d15_regs save_vfp_d8_d15_regs \
sync_synchronize
+
FUNCTIONS.armv7 := $(FUNCTIONS) \
comparedf2 comparesf2 \
adddf3vfp addsf3vfp bswapdi2 bswapsi2 divdf3vfp \
@@ -91,5 +92,5 @@ FUNCTIONS.armv7 := $(FUNCTIONS) \
muldf3vfp mulsf3vfp \
nedf2vfp nesf2vfp \
subdf3vfp subsf3vfp truncdfsf2vfp unorddf2vfp unordsf2vfp \
- modsi3 umodsi3 udivsi3 divsi3
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4
diff --git a/test/Unit/absvdi2_test.c b/test/Unit/absvdi2_test.c
index 5974f9ca764a..f0bf560681e7 100644
--- a/test/Unit/absvdi2_test.c
+++ b/test/Unit/absvdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/absvsi2_test.c b/test/Unit/absvsi2_test.c
index d7406a0f62cf..3b88078dfb4a 100644
--- a/test/Unit/absvsi2_test.c
+++ b/test/Unit/absvsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/absvti2_test.c b/test/Unit/absvti2_test.c
index 1ab4f5f6dd4f..0a1db6a5650e 100644
--- a/test/Unit/absvti2_test.c
+++ b/test/Unit/absvti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/adddf3vfp_test.c b/test/Unit/adddf3vfp_test.c
index c5bec05ca391..6ead2341abf1 100644
--- a/test/Unit/adddf3vfp_test.c
+++ b/test/Unit/adddf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/addsf3vfp_test.c b/test/Unit/addsf3vfp_test.c
index 0a731a9be5d0..ddfe39f96272 100644
--- a/test/Unit/addsf3vfp_test.c
+++ b/test/Unit/addsf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/addvdi3_test.c b/test/Unit/addvdi3_test.c
index b4247bd417e8..0d7271d5a4ae 100644
--- a/test/Unit/addvdi3_test.c
+++ b/test/Unit/addvdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/addvsi3_test.c b/test/Unit/addvsi3_test.c
index f6acde1add5f..59fd9d2ae15f 100644
--- a/test/Unit/addvsi3_test.c
+++ b/test/Unit/addvsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/addvti3_test.c b/test/Unit/addvti3_test.c
index 17a8864947ab..33cfbc98529b 100644
--- a/test/Unit/addvti3_test.c
+++ b/test/Unit/addvti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ashldi3_test.c b/test/Unit/ashldi3_test.c
index 8afe3d708402..fb80c6f77e40 100644
--- a/test/Unit/ashldi3_test.c
+++ b/test/Unit/ashldi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ashlti3_test.c b/test/Unit/ashlti3_test.c
index 2921a6aaa662..4b6c6ca0164b 100644
--- a/test/Unit/ashlti3_test.c
+++ b/test/Unit/ashlti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ashrdi3_test.c b/test/Unit/ashrdi3_test.c
index 487fa25f920a..ac517e191880 100644
--- a/test/Unit/ashrdi3_test.c
+++ b/test/Unit/ashrdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ashrti3_test.c b/test/Unit/ashrti3_test.c
index aaef120ac8dd..bfa34cbe9675 100644
--- a/test/Unit/ashrti3_test.c
+++ b/test/Unit/ashrti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/bswapdi2_test.c b/test/Unit/bswapdi2_test.c
index 177032d07d41..634c2f9b1d47 100644
--- a/test/Unit/bswapdi2_test.c
+++ b/test/Unit/bswapdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/bswapsi2_test.c b/test/Unit/bswapsi2_test.c
index 8ca4874a13c5..4fb756008b47 100644
--- a/test/Unit/bswapsi2_test.c
+++ b/test/Unit/bswapsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/clear_cache_test.c b/test/Unit/clear_cache_test.c
index 63ca66e87809..526723954177 100644
--- a/test/Unit/clear_cache_test.c
+++ b/test/Unit/clear_cache_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/test/Unit/clzdi2_test.c b/test/Unit/clzdi2_test.c
index 24b85d8b7745..58403f091f48 100644
--- a/test/Unit/clzdi2_test.c
+++ b/test/Unit/clzdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/clzsi2_test.c b/test/Unit/clzsi2_test.c
index c4555d756ca8..cc1da64b03ef 100644
--- a/test/Unit/clzsi2_test.c
+++ b/test/Unit/clzsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/clzti2_test.c b/test/Unit/clzti2_test.c
index e1229f1c4ad0..668c790b4d5a 100644
--- a/test/Unit/clzti2_test.c
+++ b/test/Unit/clzti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/cmpdi2_test.c b/test/Unit/cmpdi2_test.c
index 459a5d50baf7..609ab1a63a61 100644
--- a/test/Unit/cmpdi2_test.c
+++ b/test/Unit/cmpdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/cmpti2_test.c b/test/Unit/cmpti2_test.c
index f590ddfe5f67..2f5828ededa9 100644
--- a/test/Unit/cmpti2_test.c
+++ b/test/Unit/cmpti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/comparedf2_test.c b/test/Unit/comparedf2_test.c
index 7bbf0a3f1aa2..662372290290 100644
--- a/test/Unit/comparedf2_test.c
+++ b/test/Unit/comparedf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/comparesf2_test.c b/test/Unit/comparesf2_test.c
index c6d142466b0e..026e90053bcf 100644
--- a/test/Unit/comparesf2_test.c
+++ b/test/Unit/comparesf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ctzdi2_test.c b/test/Unit/ctzdi2_test.c
index b72fdb30750c..1f2d101a1943 100644
--- a/test/Unit/ctzdi2_test.c
+++ b/test/Unit/ctzdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ctzsi2_test.c b/test/Unit/ctzsi2_test.c
index 2c6fd0e9169f..36f221595b68 100644
--- a/test/Unit/ctzsi2_test.c
+++ b/test/Unit/ctzsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ctzti2_test.c b/test/Unit/ctzti2_test.c
index ad18b44ebab2..485a88d70a98 100644
--- a/test/Unit/ctzti2_test.c
+++ b/test/Unit/ctzti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divdc3_test.c b/test/Unit/divdc3_test.c
index c44eb5c4a9c9..9224cddceeb8 100644
--- a/test/Unit/divdc3_test.c
+++ b/test/Unit/divdc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divdf3vfp_test.c b/test/Unit/divdf3vfp_test.c
index 2ca382a5e9d3..ce5b25858113 100644
--- a/test/Unit/divdf3vfp_test.c
+++ b/test/Unit/divdf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divdi3_test.c b/test/Unit/divdi3_test.c
index 0566a785095f..c25f917a419e 100644
--- a/test/Unit/divdi3_test.c
+++ b/test/Unit/divdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divmodsi4_test.c b/test/Unit/divmodsi4_test.c
new file mode 100644
index 000000000000..bea31ea9a445
--- /dev/null
+++ b/test/Unit/divmodsi4_test.c
@@ -0,0 +1,73 @@
+//===-- divmodsi4_test.c - Test __divmodsi4 -------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file tests __divmodsi4 for the compiler_rt library.
+//
+//===----------------------------------------------------------------------===//
+
+#include "int_lib.h"
+#include <stdio.h>
+
+// Returns: a / b
+
+extern si_int __divmodsi4(si_int a, si_int b, si_int* rem);
+
+
+int test__divmodsi4(si_int a, si_int b,
+ si_int expected_result, si_int expected_rem)
+{
+ si_int rem;
+ si_int result = __divmodsi4(a, b, &rem);
+ if (result != expected_result) {
+ printf("error in __divmodsi4: %d / %d = %d, expected %d\n",
+ a, b, result, expected_result);
+ return 1;
+ }
+ if (rem != expected_rem) {
+ printf("error in __divmodsi4: %d mod %d = %d, expected %d\n",
+ a, b, rem, expected_rem);
+ return 1;
+ }
+
+ return 0;
+}
+
+
+int main()
+{
+ if (test__divmodsi4(0, 1, 0, 0))
+ return 1;
+ if (test__divmodsi4(0, -1, 0, 0))
+ return 1;
+
+ if (test__divmodsi4(2, 1, 2, 0))
+ return 1;
+ if (test__divmodsi4(2, -1, -2, 0))
+ return 1;
+ if (test__divmodsi4(-2, 1, -2, 0))
+ return 1;
+ if (test__divmodsi4(-2, -1, 2, 0))
+ return 1;
+
+ if (test__divmodsi4(7, 5, 1, 2))
+ return 1;
+ if (test__divmodsi4(-7, 5, -1, -2))
+ return 1;
+ if (test__divmodsi4(19, 5, 3, 4))
+ return 1;
+ if (test__divmodsi4(19, -5, -3, 4))
+ return 1;
+
+ if (test__divmodsi4(0x80000000, 8, 0xf0000000, 0))
+ return 1;
+ if (test__divmodsi4(0x80000007, 8, 0xf0000001, -1))
+ return 1;
+
+ return 0;
+}
diff --git a/test/Unit/divsc3_test.c b/test/Unit/divsc3_test.c
index 50979abf29f0..9d060a2d1489 100644
--- a/test/Unit/divsc3_test.c
+++ b/test/Unit/divsc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divsf3vfp_test.c b/test/Unit/divsf3vfp_test.c
index 0dbae2fc0860..6248ca0c66ee 100644
--- a/test/Unit/divsf3vfp_test.c
+++ b/test/Unit/divsf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divsi3_test.c b/test/Unit/divsi3_test.c
index 425c5798f1ab..6fda54ff37ec 100644
--- a/test/Unit/divsi3_test.c
+++ b/test/Unit/divsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divtc3_test.c b/test/Unit/divtc3_test.c
index 3fa6085002a8..815c10bcd062 100644
--- a/test/Unit/divtc3_test.c
+++ b/test/Unit/divtc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divti3_test.c b/test/Unit/divti3_test.c
index b5546caf3c68..c9eceedd40ca 100644
--- a/test/Unit/divti3_test.c
+++ b/test/Unit/divti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/divxc3_test.c b/test/Unit/divxc3_test.c
index 6c64d342e039..c93db67d875e 100644
--- a/test/Unit/divxc3_test.c
+++ b/test/Unit/divxc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/enable_execute_stack_test.c b/test/Unit/enable_execute_stack_test.c
index a0e97bb7d0b0..ae4c320adb87 100644
--- a/test/Unit/enable_execute_stack_test.c
+++ b/test/Unit/enable_execute_stack_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/test/Unit/endianness.h b/test/Unit/endianness.h
index 28b0ace6157e..6f9f77b52e51 100644
--- a/test/Unit/endianness.h
+++ b/test/Unit/endianness.h
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/test/Unit/eqdf2vfp_test.c b/test/Unit/eqdf2vfp_test.c
index 36b77ad783eb..6babd249858d 100644
--- a/test/Unit/eqdf2vfp_test.c
+++ b/test/Unit/eqdf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/eqsf2vfp_test.c b/test/Unit/eqsf2vfp_test.c
index ebcdbc4309de..4a292bc2151c 100644
--- a/test/Unit/eqsf2vfp_test.c
+++ b/test/Unit/eqsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/extebdsfdf2vfp_test.c b/test/Unit/extebdsfdf2vfp_test.c
index f2cf682e03ec..9bbe5729ed3f 100644
--- a/test/Unit/extebdsfdf2vfp_test.c
+++ b/test/Unit/extebdsfdf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ffsdi2_test.c b/test/Unit/ffsdi2_test.c
index 8713c4f6a2f6..9041127d1a62 100644
--- a/test/Unit/ffsdi2_test.c
+++ b/test/Unit/ffsdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ffsti2_test.c b/test/Unit/ffsti2_test.c
index 19da16a436e3..b679ab20fe71 100644
--- a/test/Unit/ffsti2_test.c
+++ b/test/Unit/ffsti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixdfdi_test.c b/test/Unit/fixdfdi_test.c
index d84d26d4b723..d08afe3a5336 100644
--- a/test/Unit/fixdfdi_test.c
+++ b/test/Unit/fixdfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixdfsivfp_test.c b/test/Unit/fixdfsivfp_test.c
index 00d24fb121e7..a9f012c44414 100644
--- a/test/Unit/fixdfsivfp_test.c
+++ b/test/Unit/fixdfsivfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixdfti_test.c b/test/Unit/fixdfti_test.c
index 976196380b92..5ea33172d682 100644
--- a/test/Unit/fixdfti_test.c
+++ b/test/Unit/fixdfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixsfdi_test.c b/test/Unit/fixsfdi_test.c
index 434e1a9e0efd..d3e934a5c02a 100644
--- a/test/Unit/fixsfdi_test.c
+++ b/test/Unit/fixsfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixsfsivfp_test.c b/test/Unit/fixsfsivfp_test.c
index 19d70b1e3fdb..c10152255b48 100644
--- a/test/Unit/fixsfsivfp_test.c
+++ b/test/Unit/fixsfsivfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixsfti_test.c b/test/Unit/fixsfti_test.c
index 06853072b9d0..325659e0eb92 100644
--- a/test/Unit/fixsfti_test.c
+++ b/test/Unit/fixsfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsdfdi_test.c b/test/Unit/fixunsdfdi_test.c
index fbdf3682f0ca..0803fd28f5bb 100644
--- a/test/Unit/fixunsdfdi_test.c
+++ b/test/Unit/fixunsdfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsdfsi_test.c b/test/Unit/fixunsdfsi_test.c
index 9e6b95d55500..54fe35b5c35a 100644
--- a/test/Unit/fixunsdfsi_test.c
+++ b/test/Unit/fixunsdfsi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsdfsivfp_test.c b/test/Unit/fixunsdfsivfp_test.c
index 7c968f29345d..991506f8ac12 100644
--- a/test/Unit/fixunsdfsivfp_test.c
+++ b/test/Unit/fixunsdfsivfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsdfti_test.c b/test/Unit/fixunsdfti_test.c
index 5b524666f153..1e44b82660c3 100644
--- a/test/Unit/fixunsdfti_test.c
+++ b/test/Unit/fixunsdfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunssfdi_test.c b/test/Unit/fixunssfdi_test.c
index cde3c22a702a..ac89be7bbb27 100644
--- a/test/Unit/fixunssfdi_test.c
+++ b/test/Unit/fixunssfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunssfsi_test.c b/test/Unit/fixunssfsi_test.c
index c8995b08abde..ce6a9287515f 100644
--- a/test/Unit/fixunssfsi_test.c
+++ b/test/Unit/fixunssfsi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunssfsivfp_test.c b/test/Unit/fixunssfsivfp_test.c
index 9653175f0809..08e0e8ee9bcb 100644
--- a/test/Unit/fixunssfsivfp_test.c
+++ b/test/Unit/fixunssfsivfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunssfti_test.c b/test/Unit/fixunssfti_test.c
index 33f0596c1b14..cc5e44ba59ed 100644
--- a/test/Unit/fixunssfti_test.c
+++ b/test/Unit/fixunssfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunstfdi_test.c b/test/Unit/fixunstfdi_test.c
index d96b0ea2955e..a7cc9be2fcfc 100644
--- a/test/Unit/fixunstfdi_test.c
+++ b/test/Unit/fixunstfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsxfdi_test.c b/test/Unit/fixunsxfdi_test.c
index f8c8945117ae..6d0f8d3fb65a 100644
--- a/test/Unit/fixunsxfdi_test.c
+++ b/test/Unit/fixunsxfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsxfsi_test.c b/test/Unit/fixunsxfsi_test.c
index 0353b6bf3cce..cb2a7f487210 100644
--- a/test/Unit/fixunsxfsi_test.c
+++ b/test/Unit/fixunsxfsi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixunsxfti_test.c b/test/Unit/fixunsxfti_test.c
index ae5ba08ed91e..f1f6087009d9 100644
--- a/test/Unit/fixunsxfti_test.c
+++ b/test/Unit/fixunsxfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixxfdi_test.c b/test/Unit/fixxfdi_test.c
index 47820c35b5a7..1facd36494d0 100644
--- a/test/Unit/fixxfdi_test.c
+++ b/test/Unit/fixxfdi_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/fixxfti_test.c b/test/Unit/fixxfti_test.c
index 0d3d182b4302..85c15a20c2ca 100644
--- a/test/Unit/fixxfti_test.c
+++ b/test/Unit/fixxfti_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatdidf_test.c b/test/Unit/floatdidf_test.c
index d207f5584a36..af3dacd4f38b 100644
--- a/test/Unit/floatdidf_test.c
+++ b/test/Unit/floatdidf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatdisf_test.c b/test/Unit/floatdisf_test.c
index 91e098dafd90..3e71df7b2228 100644
--- a/test/Unit/floatdisf_test.c
+++ b/test/Unit/floatdisf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatdixf_test.c b/test/Unit/floatdixf_test.c
index d96c7e8e41ce..8d049fdb8984 100644
--- a/test/Unit/floatdixf_test.c
+++ b/test/Unit/floatdixf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatsidfvfp_test.c b/test/Unit/floatsidfvfp_test.c
index 956fe86232c3..79e87b3211c1 100644
--- a/test/Unit/floatsidfvfp_test.c
+++ b/test/Unit/floatsidfvfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatsisfvfp_test.c b/test/Unit/floatsisfvfp_test.c
index 5642e9baf488..00f4ac298d3f 100644
--- a/test/Unit/floatsisfvfp_test.c
+++ b/test/Unit/floatsisfvfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floattidf_test.c b/test/Unit/floattidf_test.c
index fff51aee228b..4fcf272d8285 100644
--- a/test/Unit/floattidf_test.c
+++ b/test/Unit/floattidf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floattisf_test.c b/test/Unit/floattisf_test.c
index e4c99801a347..7e43aa10523d 100644
--- a/test/Unit/floattisf_test.c
+++ b/test/Unit/floattisf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floattixf_test.c b/test/Unit/floattixf_test.c
index ada9594c664d..5ba17f1beb25 100644
--- a/test/Unit/floattixf_test.c
+++ b/test/Unit/floattixf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatundidf_test.c b/test/Unit/floatundidf_test.c
index 5a8dcbfe1296..ae91ac374eb0 100644
--- a/test/Unit/floatundidf_test.c
+++ b/test/Unit/floatundidf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatundisf_test.c b/test/Unit/floatundisf_test.c
index 782db6d40e18..394c945a3919 100644
--- a/test/Unit/floatundisf_test.c
+++ b/test/Unit/floatundisf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatundixf_test.c b/test/Unit/floatundixf_test.c
index 40e1d720efc7..43ac85f7a805 100644
--- a/test/Unit/floatundixf_test.c
+++ b/test/Unit/floatundixf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatunssidfvfp_test.c b/test/Unit/floatunssidfvfp_test.c
index be0bd07864de..fa174ef18add 100644
--- a/test/Unit/floatunssidfvfp_test.c
+++ b/test/Unit/floatunssidfvfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatunssisfvfp_test.c b/test/Unit/floatunssisfvfp_test.c
index 13cee2f4570b..099f4e39a3ed 100644
--- a/test/Unit/floatunssisfvfp_test.c
+++ b/test/Unit/floatunssisfvfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatuntidf_test.c b/test/Unit/floatuntidf_test.c
index dff3ca6762d2..3b630f5c76ac 100644
--- a/test/Unit/floatuntidf_test.c
+++ b/test/Unit/floatuntidf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatuntisf_test.c b/test/Unit/floatuntisf_test.c
index 668e727e89cf..e80403b4991c 100644
--- a/test/Unit/floatuntisf_test.c
+++ b/test/Unit/floatuntisf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/floatuntixf_test.c b/test/Unit/floatuntixf_test.c
index ec4c3ead6cb1..9d7f974f06ce 100644
--- a/test/Unit/floatuntixf_test.c
+++ b/test/Unit/floatuntixf_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/gcc_personality_test.c b/test/Unit/gcc_personality_test.c
index 7fe661b32192..f9598c697eb6 100644
--- a/test/Unit/gcc_personality_test.c
+++ b/test/Unit/gcc_personality_test.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/test/Unit/gcc_personality_test_helper.cxx b/test/Unit/gcc_personality_test_helper.cxx
index eb64d82e612c..7d1ddfb5d960 100644
--- a/test/Unit/gcc_personality_test_helper.cxx
+++ b/test/Unit/gcc_personality_test_helper.cxx
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
diff --git a/test/Unit/gedf2vfp_test.c b/test/Unit/gedf2vfp_test.c
index 93df4c770c02..4731d3ffc3c5 100644
--- a/test/Unit/gedf2vfp_test.c
+++ b/test/Unit/gedf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/gesf2vfp_test.c b/test/Unit/gesf2vfp_test.c
index af67c70e7355..9f1c7568c0a8 100644
--- a/test/Unit/gesf2vfp_test.c
+++ b/test/Unit/gesf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/gtdf2vfp_test.c b/test/Unit/gtdf2vfp_test.c
index d39ad820661c..f28297974f11 100644
--- a/test/Unit/gtdf2vfp_test.c
+++ b/test/Unit/gtdf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/gtsf2vfp_test.c b/test/Unit/gtsf2vfp_test.c
index 40c37f2bfa7e..03fb00e19937 100644
--- a/test/Unit/gtsf2vfp_test.c
+++ b/test/Unit/gtsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ledf2vfp_test.c b/test/Unit/ledf2vfp_test.c
index 87455c38f3a0..e7ed522ab4bb 100644
--- a/test/Unit/ledf2vfp_test.c
+++ b/test/Unit/ledf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/lesf2vfp_test.c b/test/Unit/lesf2vfp_test.c
index 03cb02a59692..dc5576b9e271 100644
--- a/test/Unit/lesf2vfp_test.c
+++ b/test/Unit/lesf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/lshrdi3_test.c b/test/Unit/lshrdi3_test.c
index 90ad06b17331..ffc6a69d0e9f 100644
--- a/test/Unit/lshrdi3_test.c
+++ b/test/Unit/lshrdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/lshrti3_test.c b/test/Unit/lshrti3_test.c
index 5d68c52532e7..093a6a2eb888 100644
--- a/test/Unit/lshrti3_test.c
+++ b/test/Unit/lshrti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ltdf2vfp_test.c b/test/Unit/ltdf2vfp_test.c
index 615785ec1a8b..5051e4833a9a 100644
--- a/test/Unit/ltdf2vfp_test.c
+++ b/test/Unit/ltdf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ltsf2vfp_test.c b/test/Unit/ltsf2vfp_test.c
index 73df39f12ff6..78d2c1a3ae38 100644
--- a/test/Unit/ltsf2vfp_test.c
+++ b/test/Unit/ltsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/moddi3_test.c b/test/Unit/moddi3_test.c
index ab84c49aac7d..9f6801d6f41b 100644
--- a/test/Unit/moddi3_test.c
+++ b/test/Unit/moddi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/modsi3_test.c b/test/Unit/modsi3_test.c
index 82a0fab75ca6..52ec9a0ae36b 100644
--- a/test/Unit/modsi3_test.c
+++ b/test/Unit/modsi3_test.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*
diff --git a/test/Unit/modti3_test.c b/test/Unit/modti3_test.c
index 3cbccbe32552..3be071495ad0 100644
--- a/test/Unit/modti3_test.c
+++ b/test/Unit/modti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/muldc3_test.c b/test/Unit/muldc3_test.c
index 1d7fe4233c28..112b6120358a 100644
--- a/test/Unit/muldc3_test.c
+++ b/test/Unit/muldc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/muldf3vfp_test.c b/test/Unit/muldf3vfp_test.c
index a99d8e9a7091..7ca5559c3aab 100644
--- a/test/Unit/muldf3vfp_test.c
+++ b/test/Unit/muldf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/muldi3_test.c b/test/Unit/muldi3_test.c
index 915befa4d29c..83b525592645 100644
--- a/test/Unit/muldi3_test.c
+++ b/test/Unit/muldi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulsc3_test.c b/test/Unit/mulsc3_test.c
index fa817a6d1ee6..7a1b3ae0092d 100644
--- a/test/Unit/mulsc3_test.c
+++ b/test/Unit/mulsc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulsf3vfp_test.c b/test/Unit/mulsf3vfp_test.c
index f706c47e6c29..fcb124c94717 100644
--- a/test/Unit/mulsf3vfp_test.c
+++ b/test/Unit/mulsf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/multc3_test.c b/test/Unit/multc3_test.c
index 72adb93cbaea..40505f217f70 100644
--- a/test/Unit/multc3_test.c
+++ b/test/Unit/multc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/multi3_test.c b/test/Unit/multi3_test.c
index 4fa27965c3b5..a4c0b7dbdf51 100644
--- a/test/Unit/multi3_test.c
+++ b/test/Unit/multi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulvdi3_test.c b/test/Unit/mulvdi3_test.c
index 1c73e64c68a2..a023bf611279 100644
--- a/test/Unit/mulvdi3_test.c
+++ b/test/Unit/mulvdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulvsi3_test.c b/test/Unit/mulvsi3_test.c
index c9e239a0dbb2..1eb53a5d5daa 100644
--- a/test/Unit/mulvsi3_test.c
+++ b/test/Unit/mulvsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulvti3_test.c b/test/Unit/mulvti3_test.c
index 509b26739e12..dfe09ffc86b0 100644
--- a/test/Unit/mulvti3_test.c
+++ b/test/Unit/mulvti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/mulxc3_test.c b/test/Unit/mulxc3_test.c
index 0390d3436c82..771d19ab273b 100644
--- a/test/Unit/mulxc3_test.c
+++ b/test/Unit/mulxc3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/nedf2vfp_test.c b/test/Unit/nedf2vfp_test.c
index f2983fc0e9ca..8fdac1a03720 100644
--- a/test/Unit/nedf2vfp_test.c
+++ b/test/Unit/nedf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negdf2vfp_test.c b/test/Unit/negdf2vfp_test.c
index d019bd3aadbd..7bdf155d392f 100644
--- a/test/Unit/negdf2vfp_test.c
+++ b/test/Unit/negdf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negdi2_test.c b/test/Unit/negdi2_test.c
index 4de9ab61d1d4..510b3b046b56 100644
--- a/test/Unit/negdi2_test.c
+++ b/test/Unit/negdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negsf2vfp_test.c b/test/Unit/negsf2vfp_test.c
index 0c75fdf29fc1..419b32d726a5 100644
--- a/test/Unit/negsf2vfp_test.c
+++ b/test/Unit/negsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negti2_test.c b/test/Unit/negti2_test.c
index 13c28e6a1818..6ecc8628d77e 100644
--- a/test/Unit/negti2_test.c
+++ b/test/Unit/negti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negvdi2_test.c b/test/Unit/negvdi2_test.c
index 7fef4d97c941..9617b95ff105 100644
--- a/test/Unit/negvdi2_test.c
+++ b/test/Unit/negvdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negvsi2_test.c b/test/Unit/negvsi2_test.c
index 0480528c8493..5ea0e2e86c2a 100644
--- a/test/Unit/negvsi2_test.c
+++ b/test/Unit/negvsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/negvti2_test.c b/test/Unit/negvti2_test.c
index 7772c08ff06d..1dc904e10ab8 100644
--- a/test/Unit/negvti2_test.c
+++ b/test/Unit/negvti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/nesf2vfp_test.c b/test/Unit/nesf2vfp_test.c
index dcbc483869d3..507b42ec3c4c 100644
--- a/test/Unit/nesf2vfp_test.c
+++ b/test/Unit/nesf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/paritydi2_test.c b/test/Unit/paritydi2_test.c
index 297de8f9b7d3..5360e374d439 100644
--- a/test/Unit/paritydi2_test.c
+++ b/test/Unit/paritydi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/paritysi2_test.c b/test/Unit/paritysi2_test.c
index f15f90eb9f57..3ea8473aad5c 100644
--- a/test/Unit/paritysi2_test.c
+++ b/test/Unit/paritysi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/parityti2_test.c b/test/Unit/parityti2_test.c
index 6fe1cf65a451..c2f8d3d28a57 100644
--- a/test/Unit/parityti2_test.c
+++ b/test/Unit/parityti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/popcountdi2_test.c b/test/Unit/popcountdi2_test.c
index 6d555ce99d42..4c5611796434 100644
--- a/test/Unit/popcountdi2_test.c
+++ b/test/Unit/popcountdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/popcountsi2_test.c b/test/Unit/popcountsi2_test.c
index 3d91cde638c1..d0a05c45e544 100644
--- a/test/Unit/popcountsi2_test.c
+++ b/test/Unit/popcountsi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/popcountti2_test.c b/test/Unit/popcountti2_test.c
index 917b5cb7fbf4..53fee3b52a55 100644
--- a/test/Unit/popcountti2_test.c
+++ b/test/Unit/popcountti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/powidf2_test.c b/test/Unit/powidf2_test.c
index 48cb4bbaccdf..2abc84de7676 100644
--- a/test/Unit/powidf2_test.c
+++ b/test/Unit/powidf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/powisf2_test.c b/test/Unit/powisf2_test.c
index 789bb37de5c5..98409f432e66 100644
--- a/test/Unit/powisf2_test.c
+++ b/test/Unit/powisf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/powitf2_test.c b/test/Unit/powitf2_test.c
index 4258ce21c874..ca690fd103a0 100644
--- a/test/Unit/powitf2_test.c
+++ b/test/Unit/powitf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/powixf2_test.c b/test/Unit/powixf2_test.c
index 74403aa06a4d..67d2463ca83f 100644
--- a/test/Unit/powixf2_test.c
+++ b/test/Unit/powixf2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/subdf3vfp_test.c b/test/Unit/subdf3vfp_test.c
index ee5a492018ef..d1517ec51e38 100644
--- a/test/Unit/subdf3vfp_test.c
+++ b/test/Unit/subdf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/subsf3vfp_test.c b/test/Unit/subsf3vfp_test.c
index f6853e3dbb19..aabd01d749f8 100644
--- a/test/Unit/subsf3vfp_test.c
+++ b/test/Unit/subsf3vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/subvdi3_test.c b/test/Unit/subvdi3_test.c
index 8af79288fa9b..0fb8f5156896 100644
--- a/test/Unit/subvdi3_test.c
+++ b/test/Unit/subvdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/subvsi3_test.c b/test/Unit/subvsi3_test.c
index c37b4b215bdc..14e6ce193904 100644
--- a/test/Unit/subvsi3_test.c
+++ b/test/Unit/subvsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/subvti3_test.c b/test/Unit/subvti3_test.c
index 11d81750f0c3..a579a1fc188b 100644
--- a/test/Unit/subvti3_test.c
+++ b/test/Unit/subvti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/trampoline_setup_test.c b/test/Unit/trampoline_setup_test.c
index 8d1c968b274a..c6dbe70e0209 100644
--- a/test/Unit/trampoline_setup_test.c
+++ b/test/Unit/trampoline_setup_test.c
@@ -2,8 +2,8 @@
*
* The LLVM Compiler Infrastructure
*
- * This file is distributed under the University of Illinois Open Source
- * License. See LICENSE.TXT for details.
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
*
* ===----------------------------------------------------------------------===
*/
diff --git a/test/Unit/truncdfsf2vfp_test.c b/test/Unit/truncdfsf2vfp_test.c
index f02b8362ec20..4a44dc7919f7 100644
--- a/test/Unit/truncdfsf2vfp_test.c
+++ b/test/Unit/truncdfsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ucmpdi2_test.c b/test/Unit/ucmpdi2_test.c
index eab958931a82..22059077c795 100644
--- a/test/Unit/ucmpdi2_test.c
+++ b/test/Unit/ucmpdi2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/ucmpti2_test.c b/test/Unit/ucmpti2_test.c
index cb6b4b746ba6..d17fbb245786 100644
--- a/test/Unit/ucmpti2_test.c
+++ b/test/Unit/ucmpti2_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/udivdi3_test.c b/test/Unit/udivdi3_test.c
index 115453b4dd30..24843f8bde6a 100644
--- a/test/Unit/udivdi3_test.c
+++ b/test/Unit/udivdi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/udivmoddi4_test.c b/test/Unit/udivmoddi4_test.c
index 3ac480920812..43bf1a11f348 100644
--- a/test/Unit/udivmoddi4_test.c
+++ b/test/Unit/udivmoddi4_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/udivmodsi4_test.c b/test/Unit/udivmodsi4_test.c
new file mode 100644
index 000000000000..d734cd1fdf71
--- /dev/null
+++ b/test/Unit/udivmodsi4_test.c
@@ -0,0 +1,59 @@
+//===-- udivmodsi4_test.c - Test __udivmodsi4 -----------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file tests __udivmodsi4 for the compiler_rt library.
+//
+//===----------------------------------------------------------------------===//
+
+#include "int_lib.h"
+#include <stdio.h>
+
+// Returns: a / b
+
+extern su_int __udivmodsi4(su_int a, su_int b, su_int* rem);
+
+int test__udivmodsi4(su_int a, su_int b,
+ su_int expected_result, su_int expected_rem)
+{
+ su_int rem;
+ su_int result = __udivmodsi4(a, b, &rem);
+ if (result != expected_result) {
+ printf("error in __udivmodsi4: %u / %u = %u, expected %u\n",
+ a, b, result, expected_result);
+ return 1;
+ }
+ if (rem != expected_rem) {
+ printf("error in __udivmodsi4: %u mod %u = %u, expected %u\n",
+ a, b, rem, expected_rem);
+ return 1;
+ }
+
+ return 0;
+}
+
+
+int main()
+{
+ if (test__udivmodsi4(0, 1, 0, 0))
+ return 1;
+
+ if (test__udivmodsi4(2, 1, 2, 0))
+ return 1;
+
+ if (test__udivmodsi4(19, 5, 3, 4))
+ return 1;
+
+ if (test__udivmodsi4(0x80000000, 8, 0x10000000, 0))
+ return 1;
+
+ if (test__udivmodsi4(0x80000003, 8, 0x10000000, 3))
+ return 1;
+
+ return 0;
+}
diff --git a/test/Unit/udivmodti4_test.c b/test/Unit/udivmodti4_test.c
index d16002c7bc12..620929ae061e 100644
--- a/test/Unit/udivmodti4_test.c
+++ b/test/Unit/udivmodti4_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/udivsi3_test.c b/test/Unit/udivsi3_test.c
index 0fdf714768b8..325e4e6e8859 100644
--- a/test/Unit/udivsi3_test.c
+++ b/test/Unit/udivsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/udivti3_test.c b/test/Unit/udivti3_test.c
index 3b7846eaa6ef..a94739a7c189 100644
--- a/test/Unit/udivti3_test.c
+++ b/test/Unit/udivti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/umoddi3_test.c b/test/Unit/umoddi3_test.c
index 3ffa0be847e2..a8f39b41550d 100644
--- a/test/Unit/umoddi3_test.c
+++ b/test/Unit/umoddi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/umodsi3_test.c b/test/Unit/umodsi3_test.c
index 89c7c23bc0ea..66da695ffd96 100644
--- a/test/Unit/umodsi3_test.c
+++ b/test/Unit/umodsi3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/umodti3_test.c b/test/Unit/umodti3_test.c
index 3f6696ac2453..d75a1b3f956c 100644
--- a/test/Unit/umodti3_test.c
+++ b/test/Unit/umodti3_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/unorddf2vfp_test.c b/test/Unit/unorddf2vfp_test.c
index a08c06c39bc3..1031138ae4bd 100644
--- a/test/Unit/unorddf2vfp_test.c
+++ b/test/Unit/unorddf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/test/Unit/unordsf2vfp_test.c b/test/Unit/unordsf2vfp_test.c
index cf513969c207..dedd7ecdd8c8 100644
--- a/test/Unit/unordsf2vfp_test.c
+++ b/test/Unit/unordsf2vfp_test.c
@@ -2,8 +2,8 @@
//
// The LLVM Compiler Infrastructure
//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
diff --git a/www/index.html b/www/index.html
index f8863f8c3bfb..7a7ef7c9ee2f 100644
--- a/www/index.html
+++ b/www/index.html
@@ -23,9 +23,9 @@
call to the "__fixunsdfdi" function. The compiler-rt library provides
optimized implementations of this and other low-level routines.</p>
- <p>All of the code in the compiler-rt project is available under the standard
- <a href="http://llvm.org/docs/DeveloperPolicy.html#license">LLVM
- License</a>, a "BSD-style" license.</p>
+ <p>All of the code in the compiler-rt project is <a
+ href="http://llvm.org/docs/DeveloperPolicy.html#license">dual licensed</a>
+ under the MIT license and the UIUC License (a BSD-like license).</p>
<!--=====================================================================-->
<h2 id="goals">Goals</h2>