diff options
106 files changed, 849 insertions, 628 deletions
diff --git a/.gitignore b/.gitignore index 549ca4593..5ceb817c4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ # *.os *.oS -*.dep *.a *.i *.o diff --git a/Makefile.in b/Makefile.in index 65180f35e..0e0091f6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -203,7 +203,7 @@ install: install_runtime install_dev RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib) -$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c +$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D) $(hcompile.u) # Installs header files. @@ -212,9 +212,11 @@ $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c HEADERS_RM- := \ dl-osinfo.h \ _lfs_64.h \ + bits/uClibc_arch_features.h \ bits/kernel_sigaction.h \ bits/kernel_stat.h \ bits/kernel_types.h \ + bits/syscalls.h \ bits/syscalls-common.h \ bits/utmpx.h \ bits/uClibc_errno.h \ @@ -223,9 +225,11 @@ HEADERS_RM- := \ bits/atomic.h \ bits/sigcontextinfo.h \ bits/stackinfo.h \ - tls.h - # gcc 4.3.1 needs it, dont rm: - #bits/uClibc_arch_features.h + tls.h \ + rpc/des_crypt.h \ + rpc/key_prot.h \ + rpc/rpc_des.h \ + sgtty.h HEADERS_RM-$(UCLIBC_HAS_FLOATS) += \ complex.h \ fpu_control.h \ @@ -295,10 +299,6 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include top_builddir=$(top_builddir) \ $(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include - # Disabled. If libc-internal.h is needed, document here why! - #printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' >$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h - echo '/* Dont use _syscall#() macros; use the syscall() function */' > \ - $(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) ifeq ($(UCLIBC_HAS_WCHAR),) cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h @@ -325,7 +325,7 @@ ifeq ($(HARDWIRED_ABSPATH),y) $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ fi else - -$(INSTALL) -m 644 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifneq ($(LINUXTHREADS_OLD),y) @@ -337,7 +337,7 @@ ifeq ($(HARDWIRED_ABSPATH),y) >> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \ fi else - -$(INSTALL) -m 644 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/ endif endif endif @@ -370,7 +370,7 @@ endif install_runtime: all ifeq ($(HAVE_SHARED),y) $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib - $(INSTALL) -m 644 lib/lib*-$(VERSION).so \ + $(INSTALL) -m 755 lib/lib*-$(VERSION).so \ $(PREFIX)$(RUNTIME_PREFIX)lib (cd lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \ @@ -396,7 +396,7 @@ hostutils: install_hostutils: hostutils $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils utils_install -$(addprefix $(top_builddir),include/bits include/sys include/config extra/config/lxdialog extra/locale $(subdirs)): +$(addprefix $(top_builddir),include/bits include/sys include/config extra/config/lxdialog extra/locale extra/scripts $(subdirs)): $(do_mkdir) # configuration @@ -436,6 +436,9 @@ defconfig: $(top_builddir)extra/config/conf $(Q)$(top_builddir)extra/config/conf -d extra/Configs/Config.in \ -D extra/Configs/defconfigs/$(ARCH) +menuconfig-clean-y: + $(Q)$(MAKE) -C extra/config menuconfig_clean + include_clean: $(Q)$(RM) $(top_builddir)include/fpu_control.h $(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h @set -e; \ @@ -184,7 +184,7 @@ maybe_exec = \ CFLAGS_gen.dep = -MT $@ -MD -MP -MF $(dir $@).$(notdir $@).dep -cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) \ +cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) \ $(CFLAGS-$(suffix $@)) \ $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(<D)))) \ $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) \ @@ -198,7 +198,7 @@ cmd_compile.S = $(filter-out -std=gnu99, $(cmd_compile.c)) -D__ASSEMBLER__ $(ASF cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@)) cmd_compile.mi= $(cmd_compile.m:-c=-E -dD $(EXTRA_CPPFLAGS)) -cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@)) +cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@)) cmd_strip = $(STRIPTOOL) $(STRIP_FLAGS) $^ cmd_t_strip = $(STRIPTOOL) $(STRIP_FLAGS) $@ cmd_ar = $(AR) $(ARFLAGS) $@ $^ @@ -435,7 +435,7 @@ files.dep := $(libc-a-y) $(libc-so-y) $(libc-nonshared-y) \ FORCE: clean: objclean-y headers_clean-y -realclean: clean +realclean: clean menuconfig-clean-y $(Q)$(RM) $(.depends.dep) objclean-y: $(objclean-y) @@ -345,6 +345,7 @@ ifeq ($(TARGET_ARCH),arm) endif ifeq ($(TARGET_ARCH),mips) + OPTIMIZATIONS+=-mno-split-addresses CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1 CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2 CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3 @@ -366,6 +367,7 @@ ifeq ($(TARGET_ARCH),mips) endif ifeq ($(TARGET_ARCH),nios) + OPTIMIZATIONS+=-funaligned-struct-hack CPU_LDFLAGS-y+=-Wl,-m32 CPU_CFLAGS-y+=-Wl,-m32 endif @@ -401,6 +403,14 @@ ifeq ($(TARGET_ARCH),h8300) CPU_CFLAGS-$(CONFIG_H8S) += -ms -mint32 endif +ifeq ($(TARGET_ARCH),i960) + OPTIMIZATIONS+=-mh -mint32 #-fsigned-char +endif + +ifeq ($(TARGET_ARCH),e1) + OPTIMIZATIONS+=-mgnu-param +endif + ifeq ($(TARGET_ARCH),cris) CPU_LDFLAGS-$(CONFIG_CRIS)+=-Wl,-mcrislinux CPU_LDFLAGS-$(CONFIG_CRISV32)+=-Wl,-mcrislinux @@ -520,9 +530,6 @@ XWARNINGS+=-Wnonnull -Wundef # Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc() #XWARNINGS+=-Wdeclaration-after-statement endif -# Seems to be unused (no ARCH_CFLAGS anywhere), delete? -# if yes, remove after 0.9.31 -XARCH_CFLAGS=$(call qstrip,$(ARCH_CFLAGS)) CPU_CFLAGS=$(call qstrip,$(CPU_CFLAGS-y)) SSP_DISABLE_FLAGS ?= $(call check_gcc,-fno-stack-protector,) @@ -582,7 +589,7 @@ LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs ifeq ($(DODEBUG),y) CFLAGS += -O0 -g3 -DDEBUG else -CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS) -DNDEBUG +CFLAGS += $(OPTIMIZATION) endif ifeq ($(DOSTRIP),y) LDFLAGS += -Wl,-s diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha index fd2d7a8e5..144924a65 100644 --- a/extra/Configs/Config.alpha +++ b/extra/Configs/Config.alpha @@ -14,6 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_HAS_MMU select ARCH_HAS_NO_LDSO select UCLIBC_HAS_LFS - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index 2b91a34d3..b060ace96 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_ANY_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target ABI" default CONFIG_ARM_OABI diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32 index 8d70e6e99..cbadb4cf5 100644 --- a/extra/Configs/Config.avr32 +++ b/extra/Configs/Config.avr32 @@ -13,9 +13,6 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select FORCE_SHAREABLE_TEXT_SEGMENTS -config ARCH_CFLAGS - string - choice prompt "Target CPU Type" default CONFIG_AVR32_AP7 diff --git a/extra/Configs/Config.bfin b/extra/Configs/Config.bfin index 60c397af0..a70afcfd8 100644 --- a/extra/Configs/Config.bfin +++ b/extra/Configs/Config.bfin @@ -12,6 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_MMU - -config ARCH_CFLAGS - string diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris index b3811d1e9..52ca0c36b 100644 --- a/extra/Configs/Config.cris +++ b/extra/Configs/Config.cris @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Architecture Type" default CONFIG_CRIS diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1 index 144d9d34d..ecaa9f0e5 100644 --- a/extra/Configs/Config.e1 +++ b/extra/Configs/Config.e1 @@ -13,11 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_BIG_ENDIAN select ARCH_HAS_NO_MMU select ARCH_HAS_NO_SHARED - -config ARCH_E1 - bool - default y - -config ARCH_CFLAGS - string - default "-mgnu-param" diff --git a/extra/Configs/Config.frv b/extra/Configs/Config.frv index 63bbfed72..b389870f9 100644 --- a/extra/Configs/Config.frv +++ b/ |