summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-04-21 15:21:10 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-04-23 15:51:21 +0900
commit7dd47b95b0f54f2057d40af6e66d477e3fe95d13 (patch)
treee3523d12b24fc1f1bbdac8d5b783896f64905b99
parent20c994e4d806e0c656b5fe0d14b17896b73a086c (diff)
downloadlinux-7dd47b95b0f54f2057d40af6e66d477e3fe95d13.tar.gz
linux-7dd47b95b0f54f2057d40af6e66d477e3fe95d13.tar.bz2
linux-7dd47b95b0f54f2057d40af6e66d477e3fe95d13.zip
kbuild: consolidate redundant sed script ASM offset generation
This part ended up in redundant code after touched by multiple people. [1] Commit 3234282f33b2 ("x86, asm: Fix CFI macro invocations to deal with shortcomings in gas") added parentheses for defined expressions to support old gas for x86. [2] Commit a22dcdb0032c ("x86, asm: Fix ancient-GAS workaround") split the pattern into two to avoid parentheses for non-numeric expressions. [3] Commit 95a2f6f72d37 ("Partially revert patch that encloses asm-offset.h numbers in brackets") removed parentheses from numeric expressions as well because parentheses in MN10300 assembly have a special meaning (pointer access). Apparently, there is a conflict between [1] and [3]. After all, [3] took precedence, and a long time has passed since then. Now, merge the two patterns again because the first one is covered by the other. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
-rw-r--r--scripts/Makefile.lib1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index dd567e5d59e0..8109c133887d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -415,7 +415,6 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
# Default sed regexp - multiline due to syntax constraints
define sed-offsets
"/^->/{s:->#\(.*\):/* \1 */:; \
- s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:->::; p;}"
endef