diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2014-12-03 11:20:51 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-12-03 15:50:28 +0100 |
| commit | a234f45601e6e85a5179ec9cc446f070b86f425b (patch) | |
| tree | 7c2594f31f308e1a7ddfcfc1c3af161586ad6919 | |
| parent | b6435610f579bc53022ec9719f03bb3d75e4594a (diff) | |
build system: fix alignment function
It seriously miscomputed alignment values, always
off-by-one, and off-by-an-alignment for aligned
values.
Change-Id: Ide3477d09d34d7728cb0666bb30dd9f7a3f1056d
Reported-by: Dave Frodin <dave.frodin@se-eng.com>
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: http://review.coreboot.org/7635
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Dave Frodin <dave.frodin@se-eng.com>
| -rw-r--r-- | Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc index 11989d3f41..880c38d042 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -91,7 +91,7 @@ $(foreach supported_arch,$(ARCH_SUPPORTED), \ _toint=$(shell printf "%d" $1) _int-add2=$(shell expr $(call _toint,$1) + $(call _toint,$2)) int-add=$(if $(filter 1,$(words $1)),$(strip $1),$(call int-add,$(call _int-add2,$(word 1,$1),$(word 2,$1)) $(wordlist 3,$(words $1),$1))) -int-align=$(shell expr $(call _toint,$1) + $(call _toint,$2) - 1 - $(call _toint,$1) % $(call _toint,$2)) +int-align=$(shell A=$(call _toint,$1) B=$(call _toint,$2); expr $$A + \( \( $$B - \( $$A % $$B \) \) % $$B \) ) file-size=$(shell cat $1 | wc -c) ####################################################################### |