aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-04-29 11:06:48 -0700
committerH. Peter Anvin <hpa@zytor.com>2006-04-29 11:06:48 -0700
commit282f9091a0087dc5b0eae970c2692785c74067e3 (patch)
tree2a4e8669eb8ebb1b4f870bce2823e35cf79839db
parent8bc81542a17b2e30c97785e04fb5f729af74b24c (diff)
downloadklibc-282f9091a0087dc5b0eae970c2692785c74067e3.tar.gz
[klibc] Fix the ARM Makefile.inc to match the new variable naming standardklibc-1.3.11
Somehow, the ARM Makefile.inc escaped the jihad on ARCH* variables in favour of KLIBCARCH*. Fix this. Bug reported by Maximilian Attems, since I currently lack an ARM system :( Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--klibc/arch/arm/Makefile.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/klibc/arch/arm/Makefile.inc b/klibc/arch/arm/Makefile.inc
index 0603d850bdeff..fdca66f0e86a8 100644
--- a/klibc/arch/arm/Makefile.inc
+++ b/klibc/arch/arm/Makefile.inc
@@ -7,7 +7,7 @@
# accordingly.
#
-ARCHOBJS = \
+KLIBCARCHOBJS = \
libgcc/__divsi3.o \
libgcc/__modsi3.o \
libgcc/__udivsi3.o \
@@ -21,10 +21,10 @@ ARCHOBJS = \
arch/arm/syscall.o
ifeq ($(THUMB),y)
-ARCHOBJS += arch/arm/setjmp-thumb.o
-LIBGCC =
+KLIBCARCHOBJS += arch/arm/setjmp-thumb.o
+KLIBCLIBGCC :=
else
-ARCHOBJS += arch/arm/setjmp-arm.o
+KLIBCARCHOBJS += arch/arm/setjmp-arm.o
endif
arch/arm/sysstubs.a: arch/arm/sysstubs.pl
@@ -35,9 +35,6 @@ arch/arm/sysstubs.a: arch/arm/sysstubs.pl
$(AR) cq $@ arch/arm/sysstubs/*.o
$(RANLIB) $@
-
-ARCHSOOBJS = $(patsubst %.o,%.lo,$(ARCHOBJS))
-
archclean:
-rm -rf arch/arm/sysstubs
-rm -f arch/arm/sysstubs.a