[klibc] [klibc:master] alpha: Fix division routine generation in out-of-tree build

klibc-bot for Ben Hutchings ben at decadent.org.uk
Thu Jan 24 18:57:04 PST 2019

Commit-ID:  a78244c13724c19f2b8cc533af7284b882697c30
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=a78244c13724c19f2b8cc533af7284b882697c30
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Fri, 25 Jan 2019 02:35:31 +0000
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:38:03 +0000

[klibc] alpha: Fix division routine generation in out-of-tree build

Kbuild expands every -I in the compiler options so that in an
out-of-tree build both the source directory and corresponding
object directory are on the include path.

We currently use $(KLIBCCPPFLAGS) when compiling divide.c, which is
not expanded, so in an out-of-tree buld the compiler does not find
headers in the source tree.  Use the flags macro to expand

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

 usr/klibc/arch/alpha/Kbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/klibc/arch/alpha/Kbuild b/usr/klibc/arch/alpha/Kbuild
index a3f2706..2e566eb 100644
--- a/usr/klibc/arch/alpha/Kbuild
+++ b/usr/klibc/arch/alpha/Kbuild
@@ -34,7 +34,8 @@ $(addprefix $(obj)/,$(div-objs:.o=.S)): $(obj)/%.S: $(obj)/%.ss
 	$(call if_changed,regswap)
 quiet_cmd_genss = DIV-CC  $@
-      cmd_genss = $(CC) $(DIVCFLAGS) $(FILE_CFLAGS) $(KLIBCCPPFLAGS) \
+      cmd_genss = $(CC) $(DIVCFLAGS) $(FILE_CFLAGS) \
+                        $(call flags,KLIBCCPPFLAGS) \
                         -DNAME=$(basename $(notdir $@)) -S -o $@ $<
 $(obj)/%.ss: $(obj)/divide.c

More information about the klibc mailing list