diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 17:33:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 17:33:54 -0800 |
| commit | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (patch) | |
| tree | 12b7646800600b17cbe019fa3b452a57231f1594 | |
| parent | fd30fc3256824f03c2ff9317269d66f72f7042ca (diff) | |
| parent | a9c9dff1bc64750c81ee99779164d304c35d2ff3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/Makefile | 5 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 43fe382da07..cad10c5b83d 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile @@ -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 diff --git a/init/Kconfig b/init/Kconfig index 6c5dbedc6e9..9fc0759fa94 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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. |