From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Matthias Kaehlcke <mka@chromium.org>,
David Howells <dhowells@redhat.com>,
Michael Davidson <md@google.com>, Michal Marek <mmarek@suse.com>,
Jan Beulich <JBeulich@novell.com>,
Alexander van Heukelum <heukelum@fastmail.fm>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] kbuild: consolidate redundant sed script ASM offset generation
Date: Fri, 14 Apr 2017 14:50:02 +0900 [thread overview]
Message-ID: <1492149003-19136-2-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1492149003-19136-1-git-send-email-yamada.masahiro@socionext.com>
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>
---
scripts/Makefile.lib | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index e36427a..9c20690 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
--
2.7.4
next prev parent reply other threads:[~2017-04-14 5:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 5:50 [PATCH 0/2] kbuild: cleanup asm-offset generation, and make it work with clang Masahiro Yamada
2017-04-14 5:50 ` Masahiro Yamada [this message]
2017-04-14 16:51 ` [PATCH 1/2] kbuild: consolidate redundant sed script ASM offset generation Matthias Kaehlcke
2017-04-14 5:50 ` [PATCH 2/2] kbuild: fix asm-offset generation to work with clang Masahiro Yamada
2017-04-14 17:44 ` Matthias Kaehlcke
2017-04-18 9:57 ` [PATCH 1/2] kbuild: consolidate redundant sed script ASM offset generation David Howells
2017-04-18 10:20 ` Masahiro Yamada
2017-04-18 13:15 ` David Howells
2017-04-18 14:03 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1492149003-19136-2-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=JBeulich@novell.com \
--cc=dhowells@redhat.com \
--cc=heukelum@fastmail.fm \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=md@google.com \
--cc=mka@chromium.org \
--cc=mmarek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®