Skip to content

Commit e4691f5

Browse files
committed
make-asm-offsets: fix sed script
When copying the "sed" script to generate the asm-offsets.h file from the Linux Kbuild script into the make-asm-offsets file I missed the fact that the former runs in a "make" context and thus uses double "$$" to escape a single "$", while the latter is a shell script, where this must not be done. Unfortunately the problem did not show up during the initial tests on Power Architecture systems, but on ARM the generated asm-offsets.h was not correct. Signed-off-by: Wolfgang Denk <wd@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
1 parent f503d52 commit e4691f5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tools/scripts/make-asm-offsets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ mkdir -p $(dirname $2)
88

99
# Default sed regexp - multiline due to syntax constraints
1010
SED_CMD="/^->/{s:->#\(.*\):/* \1 */:; \
11-
s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \
12-
s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
11+
s:^->\([^ ]*\) [\$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \
12+
s:^->\([^ ]*\) [\$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
1313
s:->::; p;}"
1414

1515
(set -e

0 commit comments

Comments
 (0)