diff options
| author | Han Shen <shenhan@google.com> | 2015-11-17 16:29:47 -0800 |
|---|---|---|
| committer | Han Shen <shenhan@google.com> | 2015-11-19 17:29:00 -0800 |
| commit | 8bfb6b2bf11cfbc445239158ec28d0988f8fa947 (patch) | |
| tree | 64baf9be2b2d76eb0d3d83ec6acf3d5ddd452b64 /binutils-2.25/gas/as.c | |
| parent | 932d71b859239e834651fdee549dc661cda82fe8 (diff) | |
| download | toolchain_binutils-8bfb6b2bf11cfbc445239158ec28d0988f8fa947.tar.gz toolchain_binutils-8bfb6b2bf11cfbc445239158ec28d0988f8fa947.tar.bz2 toolchain_binutils-8bfb6b2bf11cfbc445239158ec28d0988f8fa947.zip | |
Create an unified binutils source tree for both Android and ChromiumOS.
About source code - The base version of this binutils is newer than that
of aosp/binutils-2.25, it is based on the binutils that is used to build
google products and ChromiumOS. And it contains *all* local Android
patches as well as all patches that are cherry-picked from upstream for
aosp/binutils-2.25 tree (up to Nov. 5 - 932d71b85). You may find the
detailed development history for this binutils tree here -
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
(This CL is a combination of all the CLs in it. After this CL is
submitted the tree will be identical to
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
at 2865a3615d80bd5f82d14d7e0484e84dc052596a)
About testing - We tested this binutils for both ChromiumOS and
Android. For android, we tested building N4, N5X, N6, N7, N9 using new
binutils, we also did a full-build of toolchain (by build.py) and built
a N5X image; for ChromiumOS - it passed ChromiumOS toolchain release
tests on all 4 platforms (x86, x86_64, arm32 and arm64).
Change-Id: I2bb2cf579f9458d0a8bc9612331dc7d5043e3d82
Diffstat (limited to 'binutils-2.25/gas/as.c')
| -rw-r--r-- | binutils-2.25/gas/as.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/binutils-2.25/gas/as.c b/binutils-2.25/gas/as.c index 85a04a37..3d43dae2 100644 --- a/binutils-2.25/gas/as.c +++ b/binutils-2.25/gas/as.c @@ -96,6 +96,9 @@ int debug_memory = 0; /* Enable verbose mode. */ int verbose = 0; +/* Enable incbin directive. */ +int allow_incbin_directive = 1; + /* Keep the output file. */ static int keep_it = 0; @@ -455,7 +458,9 @@ parse_args (int * pargc, char *** pargv) OPTION_REDUCE_MEMORY_OVERHEADS, OPTION_WARN_FATAL, OPTION_COMPRESS_DEBUG, - OPTION_NOCOMPRESS_DEBUG + OPTION_NOCOMPRESS_DEBUG, + OPTION_ALLOW_INCBIN, + OPTION_NOALLOW_INCBIN /* When you add options here, check that they do not collide with OPTION_MD_BASE. See as.h. */ }; @@ -473,6 +478,8 @@ parse_args (int * pargc, char *** pargv) ,{"a", optional_argument, NULL, 'a'} /* Handle -al=<FILE>. */ ,{"al", optional_argument, NULL, OPTION_AL} + ,{"allow-incbin", optional_argument, NULL, OPTION_ALLOW_INCBIN} + ,{"noallow-incbin", optional_argument, NULL, OPTION_NOALLOW_INCBIN} ,{"compress-debug-sections", no_argument, NULL, OPTION_COMPRESS_DEBUG} ,{"nocompress-debug-sections", no_argument, NULL, OPTION_NOCOMPRESS_DEBUG} ,{"debug-prefix-map", required_argument, NULL, OPTION_DEBUG_PREFIX_MAP} @@ -668,6 +675,14 @@ This program has absolutely no warranty.\n")); flag_compress_debug = 0; break; + case OPTION_ALLOW_INCBIN: + allow_incbin_directive = 1; + break; + + case OPTION_NOALLOW_INCBIN: + allow_incbin_directive = 0; + break; + case OPTION_DEBUG_PREFIX_MAP: add_debug_prefix_map (optarg); break; |