diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-12 16:12:36 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-12 16:12:36 +0000 |
| commit | 3a7ac9c7a7b4d6181d3cd70a9cb85d93a1938238 (patch) | |
| tree | f87aedb508cd30ff8d50b75dbe832d34ac5dad85 /ldso | |
| parent | b0c8130cec05f40ce926058d18fbc520b1a0e856 (diff) | |
Rewrote almost all Makefiles: do not use strip $(x),y; run strip on all objects at once; use :=//$</$^; use CRT_SRC/CRT_OBJ/SCRT_OBJ/CSRC/COBJ/SSRC/SOBJ/MSRC/MOBJ where no more is needed, if only CSRC is present use OBJS directly instead of COBJ; CTOR_TARGETS are created directly in lib; remove unused/unneeded parts. Hope I haven't broken too much.
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/Makefile | 2 | ||||
| -rw-r--r-- | ldso/ldso/Makefile | 18 | ||||
| -rw-r--r-- | ldso/libdl/Makefile | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/ldso/Makefile b/ldso/Makefile index 07bf63241..48f32602f 100644 --- a/ldso/Makefile +++ b/ldso/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)Rules.mak DIRS = ldso libdl -ifeq ($(strip $(BUILD_UCLIBC_LDSO)),y) +ifeq ($(BUILD_UCLIBC_LDSO),y) all: subdirs else all: diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index cf5d07d57..fe356ea50 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -35,11 +35,11 @@ XXFLAGS+= -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFL XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include) -ifeq ($(strip $(SUPPORT_LD_DEBUG)),y) +ifeq ($(SUPPORT_LD_DEBUG),y) XXFLAGS+=-D__SUPPORT_LD_DEBUG__ endif -ifeq ($(strip $(SUPPORT_LD_DEBUG_EARLY)),y) +ifeq ($(SUPPORT_LD_DEBUG_EARLY),y) XXFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__ endif @@ -63,7 +63,7 @@ ifeq ($(UCLIBC_BUILD_RELRO),y) LDFLAGS+=-z relro endif -ifneq ($(strip $(SUPPORT_LD_DEBUG)),y) +ifneq ($(SUPPORT_LD_DEBUG),y) LDFLAGS+=-s endif @@ -72,12 +72,12 @@ SO_LIB_NAME := $(TOPDIR)lib/$(UCLIBC_LDSO) SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so CSRC := ldso.c -COBJS := $(patsubst %.c,%.o, $(CSRC)) +COBJ := $(patsubst %.c,%.o, $(CSRC)) -ASRC := $(wildcard $(TARGET_ARCH)/*.S) -AOBJS := $(patsubst %.S,%.o, $(ASRC)) +SSRC := $(wildcard $(TARGET_ARCH)/*.S) +SOBJ := $(patsubst %.S,%.o, $(SSRC)) -OBJS := $(AOBJS) $(COBJS) +OBJS := $(SOBJ) $(COBJ) all: $(SO_LIB_NAME) @@ -89,10 +89,10 @@ $(SO_LIB_NAME): $(OBJS) -o $(TOPDIR)lib/$(SO_FULL_NAME) $^ $(LIBGCC) $(LN) -sf $(SO_FULL_NAME) $@ -$(COBJS): %.o : %.c +$(COBJ): %.o : %.c $(CC) $(XXFLAGS) -c $< -o $@ -$(AOBJS): %.o : %.S +$(SOBJ): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ clean: diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index d31ce256d..eeb7e1a5c 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -32,7 +32,7 @@ XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) \ -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I$(TOPDIR)ldso/ldso -I$(TOPDIR)include XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include) -ifeq ($(strip $(SUPPORT_LD_DEBUG)),y) +ifeq ($(SUPPORT_LD_DEBUG),y) XXFLAGS+=-D__SUPPORT_LD_DEBUG__ endif XXFLAGS_NOPIC:=$(XXFLAGS) @@ -41,7 +41,7 @@ ifeq ($(DOPIC),y) endif # BEWARE!!! At least mips* will die if -O0 is used!!! -ifeq ($(strip $(TARGET_ARCH)),mips) +ifeq ($(TARGET_ARCH),mips) XXFLAGS := $(XXFLAGS:-O0=-O1) endif @@ -55,7 +55,7 @@ OBJS := libdl.o PIC_OBJS := libdl_pic.o # we do not get here, do we need a libdl.a, if ld.so is not ours? -#ifeq ($(strip $(HAVE_SHARED)),y) +#ifeq ($(HAVE_SHARED),y) all: $(AR_LIB_NAME) $(SO_LIB_NAME) #else #all: $(AR_LIB_NAME) |