From ae5a2970eff8806dcfac05953e78077b4ef82dbf Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 5 Nov 2003 07:08:20 +0000 Subject: Rip the guts out of the dynamically generated sysconf.c, and live with a simple static version. This will need further work later on, but should do the job for the time being, --- libc/unistd/Makefile | 61 ++++------------------------------------------------ 1 file changed, 4 insertions(+), 57 deletions(-) (limited to 'libc/unistd/Makefile') diff --git a/libc/unistd/Makefile b/libc/unistd/Makefile index a8d974734..2ab770cab 100644 --- a/libc/unistd/Makefile +++ b/libc/unistd/Makefile @@ -1,7 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000,2001 Erik Andersen +# Copyright (C) 2000-2003 Erik Andersen # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU Library General Public License as published by the Free @@ -16,17 +15,13 @@ # You should have received a copy of the GNU Library General Public License # along with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Derived in part from the Linux-8086 C library, the GNU C Library, and several -# other sundry sources. Files within this library are copyright by their -# respective copyright holders. TOPDIR=../../ include $(TOPDIR)Rules.mak DIRS:= CSRC=execl.c execlp.c execv.c execvep.c execvp.c execle.c \ - sleep.c usleep.c getpass.c sysconf_src.c getlogin.c \ + sleep.c usleep.c getpass.c sysconf.c getlogin.c \ fpathconf.c confstr.c pathconf.c swab.c usershell.c \ getsubopt.c ifeq ($(strip $(UCLIBC_HAS_MMU)),y) @@ -38,13 +33,6 @@ else CSRC += getopt-susv3.c endif -# TESTING -- comment this out if it breaks for you -ifeq ($(TARGET_ARCH), $(HOST_ARCH)) - SYSCONF = sysconf_native -else - SYSCONF = sysconf_$(TARGET_ARCH).c -endif - COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) @@ -55,47 +43,6 @@ $(LIBC): ar-target subdirs ar-target: $(OBJS) $(AR) $(ARFLAGS) $(LIBC) $(OBJS) -# We are cross-compiling so use the generic sysconf.c. -sysconf_$(TARGET_ARCH).c: sysconf.c - @echo warning: sysconf_$(HOST_ARCH).c is older then sysconf.c so using generic sysconf.c - @echo To build sysconf_$(HOST_ARCH).c run gen_sysconf \> sysconf_$(HOST_ARCH).c on - @echo your target platform, place in the unistd directory, and rebuild - cp -f sysconf.c sysconf_$(TARGET_ARCH).c - -# We are compiling for the native platform, so build an optimized sysconf.c. -getpagesize_tester.o: - $(CC) $(CFLAGS) -D_UCLIBC_GENERATE_SYSCONF_ARCH \ - -c ../sysdeps/linux/common/getpagesize.c -o getpagesize_tester.o - -sysconf_tester.o: sysconf.c - $(CC) $(CFLAGS) -D_UCLIBC_GENERATE_SYSCONF_ARCH -c sysconf.c \ - -o sysconf_tester.o - -gen_sysconf_tester.o: sysconf_tester.o getpagesize_tester.o - @ld -r -o gen_sysconf_tester.o sysconf_tester.o getpagesize_tester.o - @if nm -s gen_sysconf_tester.o | grep -v "U errno" | grep " U "; then \ - set -e -x; \ - echo warning: missing symbols in gen_sysconf_tester.o so using generic sysconf.c ;\ - cp -f sysconf.c sysconf_src.c ;\ - else \ - set -e -x; \ - if ../extra/gcc-uClibc/gcc-uClibc-$(HOST_ARCH) -static \ - -D_UCLIBC_GENERATE_SYSCONF_MAIN sysconf.c sysconf_tester.o \ - -o gen_sysconf && ./gen_sysconf > sysconf_$(HOST_ARCH).c ;\ - then \ - echo successfully built sysconf_$(HOST_ARCH).c ;\ - else \ - echo warning: build of gen_sysconf failed so using generic sysconf.c ;\ - cp -f sysconf.c sysconf_$(HOST_ARCH).c ;\ - fi ;\ - fi - -sysconf_native: gen_sysconf_tester.o - -sysconf_src.c: sysconf_$(TARGET_ARCH).c - cp -f sysconf_$(TARGET_ARCH).c sysconf_src.c - - $(COBJS): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o @@ -111,9 +58,9 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy $(patsubst %, _dirclean_%, $(DIRS)) : dummy $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean -.PHONY: dummy sysconf_native +.PHONY: dummy dummy: clean: - $(RM) *.[oa] *~ core gen_sysconf sysconf_*.c + $(RM) *.[oa] *~ core -- cgit v1.2.3