Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05948d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents fd30fc32 a9c9dff1

arch/sparc64/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CC := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then 
NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow)

NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)

UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; )

INLINE_LIMIT := $(call cc-option-yn, -m64 -finline-limit=100000)



export NEW_GCC
@@ -49,10 +48,6 @@ else 
  AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL)

endif



ifeq ($(INLINE_LIMIT),y)

  CFLAGS := $(CFLAGS) -finline-limit=100000

endif



ifeq ($(CONFIG_MCOUNT),y)

  CFLAGS := $(CFLAGS) -pg

endif

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ config CC_OPTIMIZE_FOR_SIZE 
	bool "Optimize for size (Look out for broken compilers!)"

	default y

	depends on ARM || H8300 || EXPERIMENTAL

	depends on !SPARC64

	help

	  Enabling this option will pass "-Os" instead of "-O2" to gcc

	  resulting in a smaller kernel.