diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-22 05:32:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-22 05:32:10 -0400 |
commit | 1d3e07f7d0f97321121849fc064fb293b83db9ef (patch) | |
tree | ee3b76e0fc88ab868ce1ad0a045fb9786445eeb5 /arch | |
parent | 8d57d3ad0c4641bc6b720160215c907a3d1004a0 (diff) |
[SPARC64]: small Makefile cleanups
A few trivial Makefile cleanups
- dependencipes in head.o was all wrong - deleted
- CMODEL_CFLAG was not used anywhere
- NEW_GCC was then not used outside sparc64/Makefe - do not export it
- FIXME seems not appropriate - all other put oprofile in drivers-y too
- No reason to do -I. (and it still builds)
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/Makefile | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/Makefile | 9 | ||||
-rw-r--r-- | arch/sparc64/math-emu/Makefile | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 6c92a42efe76..01159cb5f16d 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile | |||
@@ -18,8 +18,6 @@ NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow) | |||
18 | NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi) | 18 | NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi) |
19 | UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; ) | 19 | UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; ) |
20 | 20 | ||
21 | export NEW_GCC | ||
22 | |||
23 | ifneq ($(NEW_GAS),y) | 21 | ifneq ($(NEW_GAS),y) |
24 | AS = sparc64-linux-as | 22 | AS = sparc64-linux-as |
25 | LD = sparc64-linux-ld | 23 | LD = sparc64-linux-ld |
@@ -58,8 +56,6 @@ core-y += arch/sparc64/kernel/ arch/sparc64/mm/ | |||
58 | core-$(CONFIG_SOLARIS_EMUL) += arch/sparc64/solaris/ | 56 | core-$(CONFIG_SOLARIS_EMUL) += arch/sparc64/solaris/ |
59 | core-y += arch/sparc64/math-emu/ | 57 | core-y += arch/sparc64/math-emu/ |
60 | libs-y += arch/sparc64/prom/ arch/sparc64/lib/ | 58 | libs-y += arch/sparc64/prom/ arch/sparc64/lib/ |
61 | |||
62 | # FIXME: is drivers- right? | ||
63 | drivers-$(CONFIG_OPROFILE) += arch/sparc64/oprofile/ | 59 | drivers-$(CONFIG_OPROFILE) += arch/sparc64/oprofile/ |
64 | 60 | ||
65 | boot := arch/sparc64/boot | 61 | boot := arch/sparc64/boot |
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile index 112c46e66578..ef50d217432f 100644 --- a/arch/sparc64/kernel/Makefile +++ b/arch/sparc64/kernel/Makefile | |||
@@ -39,12 +39,3 @@ else | |||
39 | obj-y += sys_sunos32.o sunos_ioctl32.o | 39 | obj-y += sys_sunos32.o sunos_ioctl32.o |
40 | endif | 40 | endif |
41 | endif | 41 | endif |
42 | |||
43 | ifneq ($(NEW_GCC),y) | ||
44 | CMODEL_CFLAG := -mmedlow | ||
45 | else | ||
46 | CMODEL_CFLAG := -m64 -mcmodel=medlow | ||
47 | endif | ||
48 | |||
49 | head.o: head.S ttable.S itlb_miss.S dtlb_miss.S ktlb.S tsb.S \ | ||
50 | etrap.S rtrap.S winfixup.S entry.S | ||
diff --git a/arch/sparc64/math-emu/Makefile b/arch/sparc64/math-emu/Makefile index a0b06fd29467..cc5cb9baf6aa 100644 --- a/arch/sparc64/math-emu/Makefile +++ b/arch/sparc64/math-emu/Makefile | |||
@@ -4,4 +4,4 @@ | |||
4 | 4 | ||
5 | obj-y := math.o | 5 | obj-y := math.o |
6 | 6 | ||
7 | EXTRA_CFLAGS = -I. -Iinclude/math-emu -w | 7 | EXTRA_CFLAGS = -Iinclude/math-emu -w |