[2.5] Get export-objs right

[2.5] Get export-objs right

Post by Lightweight patch manage » Tue, 23 Jul 2002 22:00:37



This corrects all export-objs directives in Makefiles that regard .c
files.

diff -Nur linux-2.5.27/arch/arm/kernel/Makefile thunder-2.5/arch/arm/kernel/Makefile
--- linux-2.5.27/arch/arm/kernel/Makefile       Sat Jul 20 13:12:18 2002
+++ thunder-2.5/arch/arm/kernel/Makefile        Mon Jul 22 06:19:21 2002
@@ -17,7 +17,7 @@
 obj-n          :=
 obj-           :=

-export-objs    := armksyms.o apm.o dma.o ecard.o fiq.o io.o time.o
+export-objs    := armksyms.o dma.o ecard.o fiq.o io.o time.o

 obj-$(CONFIG_APM)              += apm.o
 obj-$(CONFIG_ARCH_ACORN)       += ecard.o time-acorn.o
diff -Nur linux-2.5.27/arch/arm/mach-clps711x/Makefile thunder-2.5/arch/arm/mach-clps711x/Makefile
--- linux-2.5.27/arch/arm/mach-clps711x/Makefile        Sat Jul 20 13:12:26 2002
+++ thunder-2.5/arch/arm/mach-clps711x/Makefile Mon Jul 22 06:19:53 2002
@@ -14,8 +14,6 @@
 obj-n                  :=
 obj-                   :=

-export-objs            := leds-p720t.o
-
 obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o
 obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o
 obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o
diff -Nur linux-2.5.27/arch/arm/mach-ftvpci/Makefile thunder-2.5/arch/arm/mach-ftvpci/Makefile
--- linux-2.5.27/arch/arm/mach-ftvpci/Makefile  Sat Jul 20 13:12:23 2002
+++ thunder-2.5/arch/arm/mach-ftvpci/Makefile   Mon Jul 22 06:20:41 2002
@@ -14,7 +14,7 @@
 obj-n                  :=
 obj-                   :=

-export-objs            :=
+export-objs            := leds.o

 obj-$(CONFIG_PCI)      += pci.o
 obj-$(CONFIG_LEDS)     += leds.o
diff -Nur linux-2.5.27/arch/arm/mach-integrator/Makefile thunder-2.5/arch/arm/mach-integrator/Makefile
--- linux-2.5.27/arch/arm/mach-integrator/Makefile      Sat Jul 20 13:12:18 2002
+++ thunder-2.5/arch/arm/mach-integrator/Makefile       Mon Jul 22 06:20:22 2002
@@ -14,8 +14,6 @@
 obj-n                  :=
 obj-                   :=

-export-objs            := leds.o
-
 obj-$(CONFIG_LEDS)     += leds.o
 obj-$(CONFIG_PCI)      += pci_v3.o pci.o

diff -Nur linux-2.5.27/arch/arm/mach-pxa/Makefile thunder-2.5/arch/arm/mach-pxa/Makefile
--- linux-2.5.27/arch/arm/mach-pxa/Makefile     Sat Jul 20 13:11:21 2002
+++ thunder-2.5/arch/arm/mach-pxa/Makefile      Mon Jul 22 06:21:07 2002
@@ -12,7 +12,7 @@
 obj-n :=
 obj-  :=

-export-objs := generic.o irq.o dma.o sa1111.o
+export-objs := generic.o dma.o

 # Common support (must be linked before board specific support)
 obj-y += generic.o irq.o dma.o
diff -Nur linux-2.5.27/arch/arm/mach-sa1100/Makefile thunder-2.5/arch/arm/mach-sa1100/Makefile
--- linux-2.5.27/arch/arm/mach-sa1100/Makefile  Sat Jul 20 13:12:31 2002
+++ thunder-2.5/arch/arm/mach-sa1100/Makefile   Mon Jul 22 06:21:37 2002
@@ -11,8 +11,7 @@
 obj-  :=
 led-y := leds.o

-export-objs := dma.o generic.o irq.o pcipool.o sa1111.o sa1111-pcibuf.o \
-               usb_ctl.o usb_recv.o usb_send.o pm.o
+export-objs := dma.o generic.o pcipool.o sa1111.o sa1111-pcibuf.o pm.o

 # This needs to be cleaned up.  We probably need to have SA1100
 # and SA1110 config symbols.
diff -Nur linux-2.5.27/arch/i386/kernel/Makefile thunder-2.5/arch/i386/kernel/Makefile
--- linux-2.5.27/arch/i386/kernel/Makefile      Sat Jul 20 13:11:10 2002
+++ thunder-2.5/arch/i386/kernel/Makefile       Mon Jul 22 06:21:58 2002
@@ -6,7 +6,7 @@

 O_TARGET := kernel.o

-export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
+export-objs     := mca.o mtrr.o i386_ksyms.o time.o

 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
                ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
diff -Nur linux-2.5.27/arch/ia64/lib/Makefile thunder-2.5/arch/ia64/lib/Makefile
--- linux-2.5.27/arch/ia64/lib/Makefile Sat Jul 20 13:12:23 2002
+++ thunder-2.5/arch/ia64/lib/Makefile  Mon Jul 22 06:22:15 2002
@@ -4,7 +4,7 @@

 L_TARGET = lib.a

-export-objs := io.o swiotlb.o
+export-objs := swiotlb.o

 obj-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o                                 \
        __divdi3.o __udivdi3.o __moddi3.o __umoddi3.o                                   \
diff -Nur linux-2.5.27/arch/ia64/sn/io/Makefile thunder-2.5/arch/ia64/sn/io/Makefile
--- linux-2.5.27/arch/ia64/sn/io/Makefile       Sat Jul 20 13:11:11 2002
+++ thunder-2.5/arch/ia64/sn/io/Makefile        Mon Jul 22 06:22:33 2002
@@ -18,7 +18,7 @@
 O_TARGET := sgiio.o

 ifeq ($(CONFIG_MODULES),y)
-export-objs = pciio.o hcl.o pci_dma.o
+export-objs = pciio.o hcl.o
 endif

 obj-y  := stubs.o sgi_if.o pciio.o xtalk.o xbow.o xswitch.o klgraph_hack.o \
diff -Nur linux-2.5.27/arch/m68k/amiga/Makefile thunder-2.5/arch/m68k/amiga/Makefile
--- linux-2.5.27/arch/m68k/amiga/Makefile       Sat Jul 20 13:12:31 2002
+++ thunder-2.5/arch/m68k/amiga/Makefile        Mon Jul 22 06:25:28 2002
@@ -9,8 +9,6 @@

 O_TARGET := amiga.o

-export-objs    := amiga_ksyms.o
-
 obj-y          := config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o

 obj-$(CONFIG_AMIGA_PCMCIA)     += pcmcia.o
diff -Nur linux-2.5.27/arch/m68k/hp300/Makefile thunder-2.5/arch/m68k/hp300/Makefile
--- linux-2.5.27/arch/m68k/hp300/Makefile       Sat Jul 20 13:11:07 2002
+++ thunder-2.5/arch/m68k/hp300/Makefile        Mon Jul 22 06:22:53 2002
@@ -9,8 +9,6 @@

 O_TARGET := hp300.o

-export-objs    := ksyms.o
-
 obj-y          := ksyms.o config.o ints.o time.o reboot.o

 obj-$(CONFIG_VT)       += hil.o
diff -Nur linux-2.5.27/arch/m68k/sun3x/Makefile thunder-2.5/arch/m68k/sun3x/Makefile
--- linux-2.5.27/arch/m68k/sun3x/Makefile       Sat Jul 20 13:11:14 2002
+++ thunder-2.5/arch/m68k/sun3x/Makefile        Mon Jul 22 06:23:43 2002
@@ -7,7 +7,7 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...

-O_TARGET := sun3x.o
+O_TARGET := sun3x.o sun3x_ksyms.o

 obj-y          := config.o time.o dvma.o prom.o

diff -Nur linux-2.5.27/arch/mips/au1000/common/Makefile thunder-2.5/arch/mips/au1000/common/Makefile
--- linux-2.5.27/arch/mips/au1000/common/Makefile       Sat Jul 20 13:12:24 2002
+++ thunder-2.5/arch/mips/au1000/common/Makefile        Mon Jul 22 06:24:07 2002
@@ -8,7 +8,7 @@

 O_TARGET := au1000.o

-obj-y := prom.o dbg_io.o int-handler.o irq.o puts.o time.o reset.o
+obj-y := prom.o dbg_io.o int-handler.o irq.o puts.o time.o reset.o serial.o

 obj-$(CONFIG_AU1000_UART) += serial.o            
 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o            
diff -Nur linux-2.5.27/arch/mips/baget/Makefile thunder-2.5/arch/mips/baget/Makefile
--- linux-2.5.27/arch/mips/baget/Makefile       Sat Jul 20 13:12:32 2002
+++ thunder-2.5/arch/mips/baget/Makefile        Mon Jul 22 06:23:17 2002
@@ -5,7 +5,7 @@

 O_TARGET := baget.a

-export-objs            := vacserial.o vacrtc.o
+export-objs            := vacserial.o
 obj-y                  := baget.o print.o setup.o time.o irq.o bagetIRQ.o \
                           reset.o wbflush.o
 obj-$(CONFIG_SERIAL)   += vacserial.o
diff -Nur linux-2.5.27/arch/mips/kernel/Makefile thunder-2.5/arch/mips/kernel/Makefile
--- linux-2.5.27/arch/mips/kernel/Makefile      Sat Jul 20 13:11:15 2002
+++ thunder-2.5/arch/mips/kernel/Makefile       Mon Jul 22 06:25:12 2002
@@ -6,6 +6,7 @@

 O_TARGET       := kernel.o
 EXTRA_TARGETS  := head.o init_task.o
+export-objs    := mips_ksyms.o

 obj-y                          += branch.o process.o signal.o entry.o \
                                   traps.o ptrace.o vm86.o ioport.o reset.o \
@@ -27,14 +28,12 @@
 obj-$(CONFIG_SMP)              += smp.o

 # Old style irq support, going to die in 2.5.
-export-objs                    += old-irq.o
 obj-$(CONFIG_NEW_IRQ)          += irq.o
 obj-$(CONFIG_ROTTEN_IRQ)       += old-irq.o
 obj-$(CONFIG_I8259)            += i8259.o

 # transition from old time.c to new time.c
 # some boards uses old-time.c, some use time.c, and some use their own ones
-export-objs                    += old-time.o time.o
 obj-$(CONFIG_OLD_TIME_C)       += old-time.o
 obj-$(CONFIG_NEW_TIME_C)       += time.o

diff -Nur linux-2.5.27/arch/ppc/8xx_io/Makefile thunder-2.5/arch/ppc/8xx_io/Makefile
--- linux-2.5.27/arch/ppc/8xx_io/Makefile       Sat Jul 20 13:11:17 2002
+++ thunder-2.5/arch/ppc/8xx_io/Makefile        Mon Jul 22 06:25:56 2002
@@ -11,6 +11,8 @@

 O_TARGET               := 8xx_io.o

+export-objs            := fec.o
+
 obj-y                  := commproc.o uart.o

 obj-$(CONFIG_FEC_ENET) += fec.o
diff -Nur linux-2.5.27/arch/ppc64/kernel/Makefile thunder-2.5/arch/ppc64/kernel/Makefile
--- linux-2.5.27/arch/ppc64/kernel/Makefile     Sat Jul 20 13:12:26 2002
+++ thunder-2.5/arch/ppc64/kernel/Makefile      Mon Jul 22 06:26:52 2002
@@ -9,7 +9,7 @@
 O_TARGET       := kernel.o
 EXTRA_TARGETS  := $(KHEAD)

-export-objs         := ppc_ksyms.o setup.o
+export-objs         := ppc_ksyms.o

 obj-y               := ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \
                        time.o process.o signal.o syscalls.o misc.o ptrace.o \
diff -Nur linux-2.5.27/arch/sh/kernel/Makefile thunder-2.5/arch/sh/kernel/Makefile
--- linux-2.5.27/arch/sh/kernel/Makefile        Sat Jul 20 13:11:24 2002
+++ thunder-2.5/arch/sh/kernel/Makefile Mon Jul 22 06:28:39 2002
@@ -5,7 +5,8 @@
 O_TARGET       := kernel.o
 EXTRA_TARGETS  := head.o init_task.o

-export-objs    := io.o io_generic.o io_hd64461.o setup_hd64461.o sh_ksyms.o
+export-objs    := io.o io_generic.o io_hd64465.o setup_hd64465.o sh_ksyms.o \
+                  io_adx.o io_bigsur.o io_cat68701.o hd64465_gpio.o

 obj-y  := process.o signal.o entry.o traps.o irq.o irq_ipr.o \
        ptrace.o setup.o time.o sys_sh.o semaphore.o \
diff -Nur linux-2.5.27/arch/x86_64/kernel/Makefile thunder-2.5/arch/x86_64/kernel/Makefile
--- linux-2.5.27/arch/x86_64/kernel/Makefile    Sat Jul 20 13:11:10 2002
+++ thunder-2.5/arch/x86_64/kernel/Makefile     Mon Jul 22 06:29:04 2002
@@ -5,7 +5,7 @@
 O_TARGET       := kernel.o
 EXTRA_TARGETS  := head.o head64.o init_task.o

-export-objs     := mtrr.o msr.o cpuid.o x8664_ksyms.o
+export-objs     := mtrr.o x8664_ksyms.o

 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o \
                ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
diff -Nur linux-2.5.27/drivers/acorn/char/Makefile thunder-2.5/drivers/acorn/char/Makefile
--- linux-2.5.27/drivers/acorn/char/Makefile    Sat Jul 20 13:11:07 2002
+++ thunder-2.5/drivers/acorn/char/Makefile     Mon Jul 22 06:29:24 2002
@@ -3,8 +3,6 @@
 #

 # All the objects that export symbols.
-export-objs    := mouse_rpc.o
-
 obj-arc                := keyb_arc.o
 obj-rpc                := keyb_ps2.o
 obj-clps7500   := keyb_ps2.o defkeymap-acorn.o
diff -Nur linux-2.5.27/drivers/block/Makefile thunder-2.5/drivers/block/Makefile
--- linux-2.5.27/drivers/block/Makefile Sat Jul 20 13:11:33 2002
+++ thunder-2.5/drivers/block/Makefile  Mon Jul 22 06:30:19 2002
@@ -8,7 +8,8 @@
 # In the future, some of these should be built conditionally.
 #

-export-objs    :=
...

read more »

 
 
 

[2.5] Get export-objs right

Post by Russell Kin » Tue, 23 Jul 2002 22:00:50



> This corrects all export-objs directives in Makefiles that regard .c
> files.

> diff -Nur linux-2.5.27/arch/arm/kernel/Makefile thunder-2.5/arch/arm/kernel/Makefile
> --- linux-2.5.27/arch/arm/kernel/Makefile  Sat Jul 20 13:12:18 2002
> +++ thunder-2.5/arch/arm/kernel/Makefile   Mon Jul 22 06:19:21 2002

>  obj-n             :=
>  obj-              :=

> -export-objs       := armksyms.o apm.o dma.o ecard.o fiq.o io.o time.o
> +export-objs       := armksyms.o dma.o ecard.o fiq.o io.o time.o

apm.c waiting to be merged.

>  obj-$(CONFIG_APM)         += apm.o
>  obj-$(CONFIG_ARCH_ACORN)  += ecard.o time-acorn.o
> diff -Nur linux-2.5.27/arch/arm/mach-clps711x/Makefile thunder-2.5/arch/arm/mach-clps711x/Makefile
> --- linux-2.5.27/arch/arm/mach-clps711x/Makefile   Sat Jul 20 13:12:26 2002
> +++ thunder-2.5/arch/arm/mach-clps711x/Makefile    Mon Jul 22 06:19:53 2002

>  obj-n                     :=
>  obj-                      :=

> -export-objs               := leds-p720t.o
> -

This one's fine.

>  obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o
>  obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o
>  obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o
> diff -Nur linux-2.5.27/arch/arm/mach-ftvpci/Makefile thunder-2.5/arch/arm/mach-ftvpci/Makefile
> --- linux-2.5.27/arch/arm/mach-ftvpci/Makefile     Sat Jul 20 13:12:23 2002
> +++ thunder-2.5/arch/arm/mach-ftvpci/Makefile      Mon Jul 22 06:20:41 2002

>  obj-n                     :=
>  obj-                      :=

> -export-objs               :=
> +export-objs               := leds.o

Fine.

>  obj-$(CONFIG_PCI) += pci.o
>  obj-$(CONFIG_LEDS)        += leds.o
> diff -Nur linux-2.5.27/arch/arm/mach-integrator/Makefile thunder-2.5/arch/arm/mach-integrator/Makefile
> --- linux-2.5.27/arch/arm/mach-integrator/Makefile Sat Jul 20 13:12:18 2002
> +++ thunder-2.5/arch/arm/mach-integrator/Makefile  Mon Jul 22 06:20:22 2002

>  obj-n                     :=
>  obj-                      :=

> -export-objs               := leds.o
> -

Fine.

>  obj-$(CONFIG_LEDS)        += leds.o
>  obj-$(CONFIG_PCI) += pci_v3.o pci.o

> diff -Nur linux-2.5.27/arch/arm/mach-pxa/Makefile thunder-2.5/arch/arm/mach-pxa/Makefile
> --- linux-2.5.27/arch/arm/mach-pxa/Makefile        Sat Jul 20 13:11:21 2002
> +++ thunder-2.5/arch/arm/mach-pxa/Makefile Mon Jul 22 06:21:07 2002

>  obj-n :=
>  obj-  :=

> -export-objs := generic.o irq.o dma.o sa1111.o
> +export-objs := generic.o dma.o

sa1111 is waiting to appear from Nico.

>  # Common support (must be linked before board specific support)
>  obj-y += generic.o irq.o dma.o
> diff -Nur linux-2.5.27/arch/arm/mach-sa1100/Makefile thunder-2.5/arch/arm/mach-sa1100/Makefile
> --- linux-2.5.27/arch/arm/mach-sa1100/Makefile     Sat Jul 20 13:12:31 2002
> +++ thunder-2.5/arch/arm/mach-sa1100/Makefile      Mon Jul 22 06:21:37 2002

>  obj-  :=
>  led-y := leds.o

> -export-objs :=    dma.o generic.o irq.o pcipool.o sa1111.o sa1111-pcibuf.o \
> -          usb_ctl.o usb_recv.o usb_send.o pm.o
> +export-objs :=    dma.o generic.o pcipool.o sa1111.o sa1111-pcibuf.o pm.o

USB stuff pending GregKH/myself doing some evaluation work.

Quote:>  # This needs to be cleaned up.  We probably need to have SA1100
>  # and SA1110 config symbols.

I'm busy with serial stuff at the moment and haven't had time to push any
ARM stuff to Linus since .25; don't expect me to do anything with this
for a while.

--

             http://www.arm.linux.org.uk/personal/aboutme.html

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/