Menu
▾
▴
[LV-tools-commit] toolchain/patches uclibc-000011-new_Makefile.in-infrastructure.patch,NONE,1.1
|
From: Jan-Benedict G. <jb...@us...> - 2005-10-26 10:50:04
|
Update of /cvsroot/linux-vax/toolchain/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13830/patches Added Files: uclibc-000011-new_Makefile.in-infrastructure.patch Log Message: - uClibc is going to use one large Makefile infrastructure where the top-level Makefile includes all subdirectorie's Makefiles (instead of recursing through the directories and make'ing all targets there, too). - This should take the different Makefile.in into account, as well as creating us a proper VAX-specific Makefile.in . --- NEW FILE: uclibc-000011-new_Makefile.in-infrastructure.patch --- diff -Nurp src-uclibc-fresh/extra/scripts/create_links.sh src-uclibc-hacked/extra/scripts/create_links.sh --- src-uclibc-fresh/extra/scripts/create_links.sh 2005-10-26 01:57:20.000000000 +0200 +++ src-uclibc-hacked/extra/scripts/create_links.sh 2005-10-26 02:08:13.000000000 +0200 @@ -4,7 +4,7 @@ DIRS="ldso libc libcrypt libintl libm libnsl libpthread libresolv librt libutil" DIRS2="ldso/ldso ldso/libdl libpthread/linuxthreads libpthread/linuxthreads_db" -OBJ4="common arm i386 mips powerpc x86_64" +OBJ4="common arm i386 mips powerpc vax x86_64" for x in ${DIRS} ; do rm -f ${x}/Makefile diff -Nurp src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile --- src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile 2005-10-26 02:01:33.000000000 +0200 +++ src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2001 by Lineo, inc. -# -# 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 -# Software Foundation; either version 2 of the License, or (at your option) any -# later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more -# details. -# -# 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 -ASFLAGS=$(CFLAGS) - -CRT_SRC=crt1.S -CRT_OBJ=crt1.o -SCRT_OBJ=$(pathsubst %,S%, $(CRT_OBJ)) - -#SSRC=longjmp.S setjmp.S vfork.S -SSRC=__longjmp.S setjmp.S _setjmp.S clone.S -#SSRC=_setjmp.S -SOBJS=$(patsubst %.S,%.o, $(SSRC)) -CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o - -#CSRC=vfork.c _mmap.c __longjmp.c setjmp.c longjmp.c -CSRC=vfork.c _mmap.c brk.c -COBJS=$(patsubst %.c,%.o, $(CSRC)) - -OBJS=$(SOBJS) $(COBJS) - -OBJ_LIST=../../../obj.sysdeps.$(TARGET_ARCH) -all: $(OBJ_LIST) - -$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ) $(CTOR_TARGETS) - echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) - $(INSTALL) -d $(TOPDIR)lib/ - cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/ - -$(CRT_OBJ): $(CRT_SRC) - $(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o - $(STRIPTOOL) -x -R .note -R .comment $*.o - -$(SCRT_OBJ): $(CRT_SRC) - $(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o - $(STRIPTOOL) -x -R .note -R .comment $*.o - -$(LIBC): ar-target - -ar-target: $(OBJS) $(CRT0_OBJ) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) - cp $(CRT0_OBJ) $(TOPDIR)lib - -$(SOBJS): %.o : %.S - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o - -$(COBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o - -ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) -crti.o: crti.S - $(CC) $(ASFLAGS) -c crti.S -o crti.o - -$(TOPDIR)lib/crti.o: crti.o - $(INSTALL) -d $(TOPDIR)/lib/ - cp crti.o $(TOPDIR)/lib/ - -crtn.o: crtn.S - $(CC) $(ASFLAGS) -c crtn.S -o crtn.o - -$(TOPDIR)lib/crtn.o: crtn.o - $(INSTALL) -d $(TOPDIR)/lib/ - cp crtn.o $(TOPDIR)/lib/ -else -$(TOPDIR)lib/crti.o: - $(INSTALL) -d $(TOPDIR)/lib/ - $(AR) $(ARFLAGS) $(TOPDIR)/lib/crti.o - -$(TOPDIR)lib/crtn.o: - $(INSTALL) -d $(TOPDIR)lib/ - $(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o -endif - -headers: - -clean: - rm -f *.[oa] *~ core - diff -Nurp src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile.in src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile.in --- src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile.in 2005-10-26 02:11:23.000000000 +0200 @@ -0,0 +1,45 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen <and...@uc...> +# Copyright (C) 2005 Jan-Benedict Glaw <jb...@lu...> +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +#arm:CSRC:=brk.c syscall.c ioperm.c iopl.c sigaction.c __syscall_error.c +CSRC:=brk.c _mmap.c vfork.c +#arm:SSRC:= __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ +#arm: bsd-_setjmp.S sigrestorer.S mmap64.S +#vax-all:SSRC:=clone.S crt1.S crti.S crtn.S __longjmp.S _setjmp.S setjmp.S +SSRC:=__longjmp.S setjmp.S _setjmp.S clone.S + +ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/vax +ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/vax + +ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC)) +ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC)) +ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC)) +ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC)) + +ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ) + +crt-y:=create +libc-a-y+=$(ARCH_OBJS) +libc-a-pic-y+=$(ARCH_OBJS:.o=.os) +libc-so-y+=$(ARCH_OBJS:.o=.os) + +#libc-multi-y+=$(ARCH_CSRC) +libc-nomulti-y+=$(ARCH_OBJS) + +objclean-y+=arch_objclean + +arch_objclean: + $(RM) $(ARCH_OUT)/*.{o,os} + +headers-y+=arch_headers +# +arch_headers: +# arm has this, but we don't (yet?)... +# $(LN) -fs ../libc/sysdeps/linux/vax/fpu_control.h $(top_builddir)include/ +# + |
