chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] klibc: strlcpy/strlcat - don't alter destination if size == 0
[elogind.git]
/
klibc
/
MCONFIG
diff --git
a/klibc/MCONFIG
b/klibc/MCONFIG
index c83349948354e5e877968757fc630e47ea6f97e8..1141b78d474bed1d9c2361240dd11d1e4ce1b9e0 100644
(file)
--- a/
klibc/MCONFIG
+++ b/
klibc/MCONFIG
@@
-29,6
+29,10
@@
OBJROOT = $(SRCROOT)
KRNLSRC = $(SRCROOT)/linux
KRNLOBJ = $(SRCROOT)/linux
KRNLSRC = $(SRCROOT)/linux
KRNLOBJ = $(SRCROOT)/linux
+# klibc version information
+KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \
+ -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version)
+
ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
CC = $(CROSS)gcc
LD = $(CROSS)ld
ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
CC = $(CROSS)gcc
LD = $(CROSS)ld
@@
-38,7
+42,7
@@
INCLUDE = -I$(SRCROOT)/include/arch/$(ARCH) \
-I$(SRCROOT)/include/bits$(BITSIZE) \
-I$(SRCROOT)/include \
-I$(KRNLOBJ)/include -I$(KRNLOBJ)/include2 -I$(KRNLSRC)/include
-I$(SRCROOT)/include/bits$(BITSIZE) \
-I$(SRCROOT)/include \
-I$(KRNLOBJ)/include -I$(KRNLOBJ)/include2 -I$(KRNLSRC)/include
-REQFLAGS = $(ARCHREQFLAGS)
-nostdinc -iwithprefix include -D__KLIBC__
\
+REQFLAGS = $(ARCHREQFLAGS)
$(KLIBCVER) -nostdinc -iwithprefix include
\
$(INCLUDE)
LDFLAGS =
AR = $(CROSS)ar
$(INCLUDE)
LDFLAGS =
AR = $(CROSS)ar
@@
-59,7
+63,7
@@
HOST_LIBS =
# Static library paths
CRT0 = $(KLIBOBJ)/crt0.o
KLIBC = $(KLIBOBJ)/libc.a
# Static library paths
CRT0 = $(KLIBOBJ)/crt0.o
KLIBC = $(KLIBOBJ)/libc.a
-LIBGCC = $(shell $(CC) --print-libgcc)
+LIBGCC = $(shell $(CC)
$(REQFLAGS) $(OPTFLAGS)
--print-libgcc)
# Shared library paths
CRTSHARED = $(KLIBOBJ)/interp.o
# Shared library paths
CRTSHARED = $(KLIBOBJ)/interp.o