From 1200acd816010d82280fcebc1bf91b2cfe9d448d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 6 Mar 2020 21:34:18 -0800 Subject: Remove mips workarounds. Test: treehugger Change-Id: If84b54fc6cfac187e8dd8653bdf025dd7bb6f61a --- tools/mcld/Android.bp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/mcld/Android.bp b/tools/mcld/Android.bp index 9e6cc8a..3050946 100644 --- a/tools/mcld/Android.bp +++ b/tools/mcld/Android.bp @@ -67,12 +67,6 @@ cc_binary { // Include ARM libs to enable 32-bit linking on AARCH64 targets static_libs: MCLD_ARM_LIBS + MCLD_AARCH64_LIBS, }, - android_mips: { - static_libs: MCLD_MIPS_LIBS, - }, - android_mips64: { - static_libs: MCLD_MIPS_LIBS, - }, android_x86: { static_libs: MCLD_X86_LIBS, }, -- cgit v1.2.3 From 4fb4232f7db636d9c47f647991326e37c959f683 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 27 Jul 2020 18:48:19 -0700 Subject: Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: N/A (comments only) Change-Id: I5475ddd14ca54ab4ed474fdc6643cbabe15676e2 --- include/mcld/IRBuilder.h | 3 +-- unittests/test3.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/mcld/IRBuilder.h b/include/mcld/IRBuilder.h index e613dac..9dfb269 100644 --- a/include/mcld/IRBuilder.h +++ b/include/mcld/IRBuilder.h @@ -417,8 +417,7 @@ class IRBuilder { /// /// - Unresolve /// - Forcefully override the symbol in mcld::Module. With this - /// argument, AddSymbol function turns a blind eye to symbol - /// resolution rules. + /// argument, AddSymbol function ignores symbol resolution rules. /// /// @param [in] pName The name of the symbol /// @param [in] pType The type of the symbol diff --git a/unittests/test3.txt b/unittests/test3.txt index 0b4a379..02ee3fb 100644 --- a/unittests/test3.txt +++ b/unittests/test3.txt @@ -165,7 +165,7 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex $(MAKE) distclean # Kludge for pr gdb/857. intl/Makefile.in lacks a couple # of files in the distclean rule. Zack W is planning to make - # the gcc version of intl/ the master version and then push + # the gcc version of intl/ the primary version and then push # that version to src soon. See: # http://sources.redhat.com/ml/binutils/2003-07/msg00032.html # After the src version of intl/ is upgraded, we can look at -- cgit v1.2.3 From daf5c6ebc5691529ceb3a5f1a5d557b103b622a3 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 8 Feb 2021 16:13:15 -0800 Subject: Remove unused test input file. We don't run these unit tests, so the extra source inputs are unnecessary. Test: N/A Change-Id: I1d72b0d1e8ba76ac7485be75befedcd30df2006c --- unittests/test3.txt | 296 ---------------------------------------------------- 1 file changed, 296 deletions(-) delete mode 100644 unittests/test3.txt diff --git a/unittests/test3.txt b/unittests/test3.txt deleted file mode 100644 index 02ee3fb..0000000 --- a/unittests/test3.txt +++ /dev/null @@ -1,296 +0,0 @@ -HELLOopyright (C@@1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# This Makefile contains release scripts for gdb, binutils, and other -# packages which live in src. It used to be part of the top level Makefile, -# but th@@ turned out to be very messy and hard to maintain. - -# This stuff really ought to be cleaned up and turned into something other -# than a Makefile. As it is it's heavily recursive. - -# This is the name of this script (!). Needed due to horrible recursion. -SELF = src-release - -SHELL = /bin/sh - -BZIPPROG = bzip2 -MD5PROG = md5sum - -# (Default to avoid splitting info files by setting the threshold high.) -MAKEINFOFLAGS = --split-size=5000000 - -# pwd command to use. Allow user to override default by setting PWDCMD in -# the environment to account for automounters. The make variable must not -# be called PWDCMD, otherwise the value set here is passed to make -# subprocesses and overrides the setting from the user's environment. -PWD = $${PWDCMD-pwd} - -# -# Support for building net releases - -# Files in devo used in any net release. -DEVO_SUPPORT= README Makefile.in configure configure.ac \ - config.guess config.sub config move-if-change \ - COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ - mkinstalldirs ltmain.sh missing ylwrap \ - libtool.m4 ltsugar.m4 ltversion.m4 ltoptions.m4 \ - Makefile.def Makefile.tpl src-release config.rpath \ - ChangeLog MAINTAINERS README-maintainer-mode \ - lt~obsolete.m4 ltgcc.m4 depcomp mkdep compile \ - COPYING3 COPYING3.LIB - -# Files in devo/etc used in any net release. -ETC_SUPPORT= Makefile.in configure configure.in standards.texi \ - make-stds.texi standards.info* configure.texi configure.info* \ - ChangeLog configbuild.* configdev.* fdl.texi texi2pod.pl gnu-oids.texi - - -# When you use `make setup-dirs' or `make taz' you should always redefine -# this macro. -SUPPORT_FILES = list-of-support-files-for-tool-in-question - -# NOTE: No double quotes in the below. It is used within shell script -# as VER="$(VER)" -VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \ - sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \ - elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ - sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \ - elif test -f $(TOOL)/version.in; then \ - head -1 $(TOOL)/version.in; \ - elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \ - sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \ - else \ - echo VERSION; \ - fi` -PACKAGE = $(TOOL) - -.PHONY: taz -taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex - $(MAKE) -f $(SELF) do-proto-toplev \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-md5sum \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-tar \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-bz2 \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - -.PHONY: gdb-tar -gdb-tar: $(DEVO_SUPPORT)OH(SUPPORT_FILES) texinfo/texinfo.tex - $(MAKE) -f $(SELF) do-proto-toplev \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-md5sum \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-djunpack \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-tar \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - -.PHONY: gdb-taz -gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex - $(MAKE) -f $(SELF) gdb-tar \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - $(MAKE) -f $(SELF) do-bz2 \ - TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(SUPPORT_FILES)" - -.PHONY: do-proto-toplev -do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex - echo "==> Making $(PACKAGE)-$(VER)/" - # Take out texinfo from a few places. - sed -e '/^all\.normal: /s/\all-texinfo //' \ - -e '/^ install-texinfo /d' \ - tmp - mv -f tmp Makefile.in - # - ./configure i686-pc-linux-gnu - $(MAKE) configure-host configure-target \ - ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \ - CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)" - # Make links, and run "make diststuff" or "make info" when needed. - rm -rf proto-toplev ; mkdir proto-toplev - set -e ; dirs="$(DEVO_SUPPORT) $(SUPPORT_FILES) $(TOOL)" ; \ - for d in $$dirs ; do \ - if [ -d $$d ]; then \ - if [ ! -f $$d/Makefile ] ; then true ; \ - elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \ - (cd $$d ; $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" \ - diststuff ) || exit 1 ; \ - elif grep '^info:' $$d/Makefile >/dev/null ; then \ - (cd $$d ; $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" \ - info ) || exit 1 ; \ - fi ; \ - if [ -d $$d/proto-$$d.dir ]; then \ - ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \ - else \ - ln -s ../$$d proto-toplev/$$d ; \ - fi ; \ - else ln -s ../$$d proto-toplev/$$d ; fi ; \ - done - cd etc && $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" info - $(MAKE) distclean - # Kludge for pr gdb/857. intl/Makefile.in lacks a couple - # of files in the distclean rule. Zack W is planning to make - # the gcc version of intl/ the primary version and then push - # that version to src soon. See: - # http://sources.redhat.com/ml/binutils/2003-07/msg00032.html - # After the src version of intl/ is upgraded, we can look at - # moving this logic into intl/Makefile.in distclean rule - # if it is still needed. -- chastain 2003-09-12 - rm -f intl/config.cache - rm -f intl/config.status - rm -f intl/config.h - rm -f intl/stamp-h - # - mkdir proto-toplev/etc - (cd proto-toplev/etc; \ - for i in $(ETC_SUPPORT); do \ - ln -s ../../etc/$$i . ; \ - done) - # - # Take out texinfo from configurable dirs - rm proto-toplev/configure.ac - sed -e '/^host_tools=/s/texinfo //' \ - proto-toplev/configure.ac - # - mkdir proto-toplev/texinfo - ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/ - if test -r texinfo/util/tex3patch ; then \ - mkdir proto-toplev/texinfo/util && \ - ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \ - else true; fi - chmod -R og=u . || chmod og=u `find . -print` - # - # Create .gmo files from .po files. - for f in `find . -name '*.po' -type f -print`; do \ - msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \ - done - # - -rm -f $(PACKAGE)-$(VER) - ln -s proto-toplev $(PACKAGE)-$(VER) - -CVS_NAMES= \( -name CVS -o -name '.cvsignore' \) - -.PHONY: do-tar -do-tar: - echo "==> Making $(PACKAGE)-$(VER).tar" - -rm -f $(PACKAGE)-$(VER).tar - find $(PACKAGE)-$(VER) -follow $(CVS_NAMES) -prune \ - -o -type f -print \ - | tar cTfh - $(PACKAGE)-$(VER).tar - -.PHONY: do-bz2 -do-bz2: - echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2" - -rm -f $(PACKAGE)-$(VER).tar.bz2 - $(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar - -.PHONY: do-md5sum -do-md5sum: - echo "==> Adding md5 checksum to top-level directory" - cd proto-toplev && find * -follow $(CVS_NAMES) -prune \ - -o -type f -print \ - | xargs $(MD5PROG) > ../md5.new - -rm -f proto-toplev/md5.sum - mv md5.new proto-toplev/md5.sum - -.PHONY: do-djunpack -do-djunpack: - echo "==> Adding updated djunpack.bat to top-level directory" - echo - 's /gdb-[0-9\.]*/$(PACKAGE)-'"$(VER)"'/' - sed < djunpack.bat > djunpack.new \ - -e 's/gdb-[0-9][0-9\.]*/$(PACKAGE)-'"$(VER)"'/' - -rm -f proto-toplev/djunpack.bat - mv djunpack.new proto-toplev/djunpack.bat - -TEXINFO_SUPPORT= texinfo/texinfo.tex -DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT) - -.PHONY: gas.tar.bz2 -GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep -gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas - $(MAKE) -f $(SELF) taz TOOL=gas \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(GAS_SUPPORT_DIRS)" - -# The FSF "binutils" release includes gprof and ld. -.PHONY: binutils.tar.bz2 -BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu -binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils - $(MAKE) -f $(SELF) taz TOOL=binutils \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)" - -.PHONY: gas+binutils.tar.bz2 -GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof -gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas - $(MAKE) -f $(SELF) taz TOOL=gas \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(GASB_SUPPORT_DIRS)" - -GNATS_SUPPORT_DIRS=include libiberty send-pr -gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats - $(MAKE) -f $(SELF) taz TOOL=gnats \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)" - -.PHONY: gdb.tar.bz2 -GDB_SUPPORT_DIRS= bfd include libiberty opcodes readline sim intl libdecnumber -gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-taz TOOL=gdb \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(GDB_SUPPORT_DIRS)" -.PHONY: gdb.tar -gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-tar TOOL=gdb \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(GDB_SUPPORT_DIRS)" - -.PHONY: insight.tar.bz2 -INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui -insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=insight \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)" -.PHONY: insight.tar -insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb - $(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=insight \ - MD5PROG="$(MD5PROG)" \ - SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)" - -.NOEXPORT: -MAKEOVERRIDES= -- cgit v1.2.3 From dc3c1f8969d99828efbd16c8dfb5a2275e325816 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 20:36:02 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA to: Android.bp Added SPDX-license-identifier-NCSA to: lib/ADT/Android.bp lib/Android.bp lib/Core/Android.bp lib/Fragment/Android.bp lib/LD/Android.bp lib/MC/Android.bp lib/Object/Android.bp lib/Script/Android.bp lib/Support/Android.bp lib/Target/AArch64/Android.bp lib/Target/AArch64/TargetInfo/Android.bp lib/Target/ARM/Android.bp lib/Target/ARM/TargetInfo/Android.bp lib/Target/Android.bp lib/Target/Mips/Android.bp lib/Target/Mips/TargetInfo/Android.bp lib/Target/X86/Android.bp lib/Target/X86/TargetInfo/Android.bp tools/mcld/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I61793a4a7ca858b4b6e9eab8d732784f12a1d52c --- Android.bp | 31 +++++++++++++++++++++++++++++++ lib/ADT/Android.bp | 9 +++++++++ lib/Android.bp | 9 +++++++++ lib/Core/Android.bp | 9 +++++++++ lib/Fragment/Android.bp | 9 +++++++++ lib/LD/Android.bp | 9 +++++++++ lib/MC/Android.bp | 9 +++++++++ lib/Object/Android.bp | 9 +++++++++ lib/Script/Android.bp | 9 +++++++++ lib/Support/Android.bp | 9 +++++++++ lib/Target/AArch64/Android.bp | 9 +++++++++ lib/Target/AArch64/TargetInfo/Android.bp | 9 +++++++++ lib/Target/ARM/Android.bp | 9 +++++++++ lib/Target/ARM/TargetInfo/Android.bp | 9 +++++++++ lib/Target/Android.bp | 9 +++++++++ lib/Target/Mips/Android.bp | 9 +++++++++ lib/Target/Mips/TargetInfo/Android.bp | 9 +++++++++ lib/Target/X86/Android.bp | 9 +++++++++ lib/Target/X86/TargetInfo/Android.bp | 9 +++++++++ tools/mcld/Android.bp | 9 +++++++++ 20 files changed, 202 insertions(+) diff --git a/Android.bp b/Android.bp index 6ecc52d..5efa226 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,34 @@ +package { + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "frameworks_compile_mclinker_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-NCSA", + ], + license_text: [ + "LICENSE.TXT", + ], +} + cc_defaults { name: "mcld-defaults", defaults: ["llvm-defaults"], diff --git a/lib/ADT/Android.bp b/lib/ADT/Android.bp index ee09f47..43ab95a 100644 --- a/lib/ADT/Android.bp +++ b/lib/ADT/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldADT", defaults: ["mcld-defaults"], diff --git a/lib/Android.bp b/lib/Android.bp index b44c296..2c8bedb 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -1 +1,10 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + subdirs = ["*"] diff --git a/lib/Core/Android.bp b/lib/Core/Android.bp index e3934bd..6e6f0c8 100644 --- a/lib/Core/Android.bp +++ b/lib/Core/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldCore", defaults: ["mcld-defaults"], diff --git a/lib/Fragment/Android.bp b/lib/Fragment/Android.bp index 0da4a5b..fef8586 100644 --- a/lib/Fragment/Android.bp +++ b/lib/Fragment/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldFragment", defaults: ["mcld-defaults"], diff --git a/lib/LD/Android.bp b/lib/LD/Android.bp index a296d81..d8f7030 100644 --- a/lib/LD/Android.bp +++ b/lib/LD/Android.bp @@ -2,6 +2,15 @@ // Static library: libmcldLD // ===================================================== +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldLD", defaults: ["mcld-defaults"], diff --git a/lib/MC/Android.bp b/lib/MC/Android.bp index addc270..8c82a29 100644 --- a/lib/MC/Android.bp +++ b/lib/MC/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldMC", defaults: ["mcld-defaults"], diff --git a/lib/Object/Android.bp b/lib/Object/Android.bp index c671359..ec8e4f9 100644 --- a/lib/Object/Android.bp +++ b/lib/Object/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldObject", defaults: ["mcld-defaults"], diff --git a/lib/Script/Android.bp b/lib/Script/Android.bp index c90f3b0..8d20ed2 100644 --- a/lib/Script/Android.bp +++ b/lib/Script/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldScript", defaults: ["mcld-defaults"], diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp index 324390a..d2887eb 100644 --- a/lib/Support/Android.bp +++ b/lib/Support/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldSupport", defaults: ["mcld-defaults"], diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp index d922741..6a532ca 100644 --- a/lib/Target/AArch64/Android.bp +++ b/lib/Target/AArch64/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldAArch64Target", defaults: ["mcld-defaults"], diff --git a/lib/Target/AArch64/TargetInfo/Android.bp b/lib/Target/AArch64/TargetInfo/Android.bp index 6900d91..118b56b 100644 --- a/lib/Target/AArch64/TargetInfo/Android.bp +++ b/lib/Target/AArch64/TargetInfo/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldAArch64Info", defaults: ["mcld-defaults"], diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp index 10e2a41..ce520cb 100644 --- a/lib/Target/ARM/Android.bp +++ b/lib/Target/ARM/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldARMTarget", defaults: ["mcld-defaults"], diff --git a/lib/Target/ARM/TargetInfo/Android.bp b/lib/Target/ARM/TargetInfo/Android.bp index 8717576..d484a00 100644 --- a/lib/Target/ARM/TargetInfo/Android.bp +++ b/lib/Target/ARM/TargetInfo/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldARMInfo", defaults: ["mcld-defaults"], diff --git a/lib/Target/Android.bp b/lib/Target/Android.bp index d852c11..6636193 100644 --- a/lib/Target/Android.bp +++ b/lib/Target/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldTarget", defaults: ["mcld-defaults"], diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp index 3e281b4..c9d6260 100644 --- a/lib/Target/Mips/Android.bp +++ b/lib/Target/Mips/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldMipsTarget", defaults: ["mcld-defaults"], diff --git a/lib/Target/Mips/TargetInfo/Android.bp b/lib/Target/Mips/TargetInfo/Android.bp index 6c60603..2ef199f 100644 --- a/lib/Target/Mips/TargetInfo/Android.bp +++ b/lib/Target/Mips/TargetInfo/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldMipsInfo", defaults: ["mcld-defaults"], diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp index 603bff1..8f66271 100644 --- a/lib/Target/X86/Android.bp +++ b/lib/Target/X86/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldX86Target", defaults: ["mcld-defaults"], diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp index b02c039..71897f8 100644 --- a/lib/Target/X86/TargetInfo/Android.bp +++ b/lib/Target/X86/TargetInfo/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + cc_library_static { name: "libmcldX86Info", defaults: ["mcld-defaults"], diff --git a/tools/mcld/Android.bp b/tools/mcld/Android.bp index 3050946..3342f36 100644 --- a/tools/mcld/Android.bp +++ b/tools/mcld/Android.bp @@ -1,4 +1,13 @@ // Collect target specific code generation libraries +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_mclinker_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_mclinker_license"], +} + MCLD_ARM_LIBS = [ "libmcldARMTarget", "libmcldARMInfo", -- cgit v1.2.3 From 036793a771d662ee50555aba082ef2772fb2144f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 10 May 2021 15:04:27 -0700 Subject: Teach mclinker that SHT_RELR sections are just relocations. Nothing to see here, mclinker... We can't use the named constant because the version of LLVM used by mclinker is too old to have it, so mclinker gets a hard-coded 19. Bug: http://b/147452927 Test: atest CtsRsCppTestCases:android.cts.rscpp.RSYuvTest#test_YV12 -- --abi x86_64 Change-Id: I71e84b4f030396c2515feedb8248a06e1603a176 --- lib/Core/IRBuilder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Core/IRBuilder.cpp b/lib/Core/IRBuilder.cpp index 4c6eab8..3c3823e 100644 --- a/lib/Core/IRBuilder.cpp +++ b/lib/Core/IRBuilder.cpp @@ -82,6 +82,7 @@ LDFileFormat::Kind GetELFSectionKind(uint32_t pType, return LDFileFormat::NamePool; case llvm::ELF::SHT_RELA: case llvm::ELF::SHT_REL: + case 19 /*llvm::ELF::SHT_RELR*/: return LDFileFormat::Relocation; case llvm::ELF::SHT_NOBITS: return LDFileFormat::BSS; -- cgit v1.2.3