[compiler-rt] r204128 - Move Android ucontext.h out of third_party.

Evgeniy Stepanov eugeni.stepanov at gmail.com
Tue Mar 18 01:32:15 PDT 2014


Author: eugenis
Date: Tue Mar 18 03:32:14 2014
New Revision: 204128

URL: http://llvm.org/viewvc/llvm-project?rev=204128&view=rev
Log:
Move Android ucontext.h out of third_party.

Google is re-licensing this code under the standard dual license of
compiler-rt.

Added:
    compiler-rt/trunk/android/
      - copied from r204123, compiler-rt/trunk/third_party/android/
Removed:
    compiler-rt/trunk/android/LICENSE.TXT
    compiler-rt/trunk/third_party/
Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/LICENSE.TXT
    compiler-rt/trunk/android/README.LLVM
    compiler-rt/trunk/android/include/sys/ucontext.h
    compiler-rt/trunk/android/include/ucontext.h
    compiler-rt/trunk/make/platform/clang_linux.mk

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=204128&r1=204127&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Mar 18 03:32:14 2014
@@ -140,7 +140,7 @@ set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRE
 set(COMPILER_RT_DARWIN_SDK_SYSROOT ${COMPILER_RT_SOURCE_DIR}/SDKs/darwin)
 set(COMPILER_RT_LINUX_SDK_SYSROOT ${COMPILER_RT_SOURCE_DIR}/SDKs/linux)
 
-set(COMPILER_RT_EXTRA_ANDROID_HEADERS ${COMPILER_RT_SOURCE_DIR}/third_party/android/include)
+set(COMPILER_RT_EXTRA_ANDROID_HEADERS ${COMPILER_RT_SOURCE_DIR}/android/include)
 
 # Detect whether the current target platform is 32-bit or 64-bit, and setup
 # the correct commandline flags needed to attempt to target 32-bit and 64-bit.

Modified: compiler-rt/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/LICENSE.TXT?rev=204128&r1=204127&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/LICENSE.TXT (original)
+++ compiler-rt/trunk/LICENSE.TXT Tue Mar 18 03:32:14 2014
@@ -89,9 +89,3 @@ other licenses gives permission to use t
 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
--------             ---------
-android headers     third_party/android

Removed: compiler-rt/trunk/android/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/third_party/android/LICENSE.TXT?rev=204123&view=auto
==============================================================================
--- compiler-rt/trunk/android/LICENSE.TXT (original)
+++ compiler-rt/trunk/android/LICENSE.TXT (removed)
@@ -1,28 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: compiler-rt/trunk/android/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/android/README.LLVM?rev=204128&r1=204123&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/android/README.LLVM (original)
+++ compiler-rt/trunk/android/README.LLVM Tue Mar 18 03:32:14 2014
@@ -3,4 +3,7 @@ LLVM notes
 
 This directory contains Android header ucontext.h missing from the NDK.
 This version of the header was copied from google-breakpad at r1279.
-No local changes.
+
+Local changes:
+  * Re-licensed under the standard dual license of compiler-rt.
+

Modified: compiler-rt/trunk/android/include/sys/ucontext.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/android/include/sys/ucontext.h?rev=204128&r1=204123&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/android/include/sys/ucontext.h (original)
+++ compiler-rt/trunk/android/include/sys/ucontext.h Tue Mar 18 03:32:14 2014
@@ -1,31 +1,11 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
+//===-- ucontext.h ----------------------------------------------*- C++ -*-===//
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
+//                     The LLVM Compiler Infrastructure
 //
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// ===----------------------------------------------------------------------===
 
 #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_UCONTEXT_H
 #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_UCONTEXT_H

Modified: compiler-rt/trunk/android/include/ucontext.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/android/include/ucontext.h?rev=204128&r1=204123&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/android/include/ucontext.h (original)
+++ compiler-rt/trunk/android/include/ucontext.h Tue Mar 18 03:32:14 2014
@@ -1,31 +1,11 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
+//===-- ucontext.h ----------------------------------------------*- C++ -*-===//
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
+//                     The LLVM Compiler Infrastructure
 //
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// ===----------------------------------------------------------------------===
 
 #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H
 #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H

Modified: compiler-rt/trunk/make/platform/clang_linux.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=204128&r1=204127&r2=204128&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_linux.mk (original)
+++ compiler-rt/trunk/make/platform/clang_linux.mk Tue Mar 18 03:32:14 2014
@@ -111,7 +111,7 @@ ANDROID_COMMON_FLAGS := -target arm-linu
 	-B$(LLVM_ANDROID_TOOLCHAIN_DIR)
 CFLAGS.asan-arm-android := $(CFLAGS) -fPIC -fno-builtin \
 	$(ANDROID_COMMON_FLAGS) -fno-rtti \
-	-I$(ProjSrcRoot)/third_party/android/include
+	-I$(ProjSrcRoot)/android/include
 LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \
 	-lstdc++ -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs
 





More information about the llvm-commits mailing list