X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Rules.mak;h=00e8481b8564310160b4794e40e2ecd20d216fbf;hb=03a008e27f61ee805ec1cc914fbe60f6eb34887c;hp=84d3fecbc3fd0876ebdbcc12f2874e63b76a0ca3;hpb=c3e65564910151c3dc5e827945e3138287a3b901;p=uclinux-h8%2FuClibc.git diff --git a/Rules.mak b/Rules.mak index 84d3fecbc..00e8481b8 100644 --- a/Rules.mak +++ b/Rules.mak @@ -104,8 +104,8 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR # Now config hard core MAJOR_VERSION := 0 MINOR_VERSION := 9 -SUBLEVEL := 33 -EXTRAVERSION :=-rc1-git +SUBLEVEL := 34 +EXTRAVERSION :=-git VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ABI_VERSION := $(MAJOR_VERSION) ifneq ($(EXTRAVERSION),) @@ -158,7 +158,7 @@ endif comma:=, space:= # -ifndef CROSS_COMPILE +ifeq ($(CROSS_COMPILE),) CROSS_COMPILE=$(call qstrip,$(CROSS_COMPILER_PREFIX)) endif @@ -198,7 +198,7 @@ endef define check-as-var $(call check-tool-var,check_as,ASFLAG,$(1)) _v = CFLAG_-Wa$(1) -export $(_v) = $$(if $$(ASFLAG_$(1)),-Wa$$(comma)$$(ASFLAG_$(1))) +export $$(_v) = $$(if $$(ASFLAG_$(1)),-Wa$$(comma)$$(ASFLAG_$(1))) endef # Usage: check-ld-var, # Check the linker to see if it supports . Export the @@ -361,8 +361,8 @@ endif # 0 .text xxxxxxxx 00000000 00000000 xxxxxxxx 2**2 <===! CPU_CFLAGS-y += $(CFLAG_-ffunction-sections) $(CFLAG_-fdata-sections) CPU_LDFLAGS-y += $(CFLAG_-Wl--sort-common) -$(eval $(call check-ld-var,--sort-section%alignment)) - CPU_LDFLAGS-y += $(CFLAG_-Wl--sort-section%alignment) +$(eval $(call check-ld-var,--sort-section=alignment)) + CPU_LDFLAGS-y += $(CFLAG_-Wl--sort-section=alignment) CPU_LDFLAGS-y+=-m32 CPU_CFLAGS-y+=-m32 @@ -766,7 +766,7 @@ CFLAGS += -I$(top_srcdir)libc/sysdeps/linux/common CFLAGS += -I$(KERNEL_HEADERS) #CFLAGS += -iwithprefix include-fixed -iwithprefix include -$(eval $(call cache-output-var,CC_IPREFIX,$(CC) --print-file-name=include)) +$(eval $(call cache-output-var,CC_IPREFIX,$(CC) -print-file-name=include)) CC_INC := -isystem $(dir $(CC_IPREFIX))include-fixed -isystem $(CC_IPREFIX) CFLAGS += $(CC_INC)