x86 vDSO: arch/x86/vdso/vdso32
Roland McGrath [Wed, 30 Jan 2008 12:30:42 +0000 (13:30 +0100)]
This moves the i386 vDSO sources into arch/x86/vdso/vdso32/, a
new directory.  This patch is a pure renaming, but paves the way
for consolidating the vDSO build logic.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/x86/ia32/vsyscall-sigreturn.S
arch/x86/kernel/Makefile_32
arch/x86/vdso/vdso32/int80.S [moved from arch/x86/kernel/vsyscall-int80_32.S with 97% similarity]
arch/x86/vdso/vdso32/note.S [moved from arch/x86/kernel/vsyscall-note_32.S with 95% similarity]
arch/x86/vdso/vdso32/sigreturn.S [moved from arch/x86/kernel/vsyscall-sigreturn_32.S with 97% similarity]
arch/x86/vdso/vdso32/sysenter.S [moved from arch/x86/kernel/vsyscall-sysenter_32.S with 99% similarity]

index b383be0..295eecf 100644 (file)
@@ -139,5 +139,4 @@ __kernel_rt_sigreturn:
        .align 4
 .LENDFDE3:
 
-#include "../../x86/kernel/vsyscall-note_32.S"
-
+#include "../vdso/vdso32/note.S"
index eb2da53..f7c1c1c 100644 (file)
@@ -56,6 +56,9 @@ $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F_32.o vsyscall-$F_32.so)
 targets += vsyscall-note_32.o vsyscall_32.lds
 
+$(obj)/vsyscall-%_32.o: $(src)/../vdso/vdso32/%.S
+       $(call if_changed_dep,as_o_S)
+
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
       cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
similarity index 97%
rename from arch/x86/kernel/vsyscall-int80_32.S
rename to arch/x86/vdso/vdso32/int80.S
index 103cab6..3c8e4c6 100644 (file)
@@ -50,4 +50,4 @@ __kernel_vsyscall:
 /*
  * Get the common code for the sigreturn entry points.
  */
-#include "vsyscall-sigreturn_32.S"
+#include "sigreturn.S"
similarity index 95%
rename from arch/x86/kernel/vsyscall-note_32.S
rename to arch/x86/vdso/vdso32/note.S
index fcf376a..0cf934f 100644 (file)
@@ -33,7 +33,7 @@ ELFNOTE_END
  * at boot time we set VDSO_NOTE_NONEGSEG_BIT if running under Xen.
  */
 
-#include "../../x86/xen/vdso.h"        /* Defines VDSO_NOTE_NONEGSEG_BIT.  */
+#include "../../xen/vdso.h"    /* Defines VDSO_NOTE_NONEGSEG_BIT.  */
 
        .globl VDSO_NOTE_MASK
 ELFNOTE_START(GNU, 2, "a")
similarity index 97%
rename from arch/x86/kernel/vsyscall-sigreturn_32.S
rename to arch/x86/vdso/vdso32/sigreturn.S
index e939253..778f464 100644 (file)
@@ -70,9 +70,9 @@ __kernel_rt_sigreturn:
           be the value of the stack pointer in the caller.  This means
           that we must define the CFA of this body of code to be the
           saved value of the stack pointer in the sigcontext.  Which
-          also means that there is no fixed relation to the other 
+          also means that there is no fixed relation to the other
           saved registers, which means that we must use DW_CFA_expression
-          to compute their addresses.  It also means that when we 
+          to compute their addresses.  It also means that when we
           adjust the stack with the popl, we have to do it all over again.  */
 
 #define do_cfa_expr(offset)                                            \
similarity index 99%
rename from arch/x86/kernel/vsyscall-sysenter_32.S
rename to arch/x86/vdso/vdso32/sysenter.S
index ed879bf..4b98fc4 100644 (file)
@@ -119,4 +119,4 @@ SYSENTER_RETURN:
 /*
  * Get the common code for the sigreturn entry points.
  */
-#include "vsyscall-sigreturn_32.S"
+#include "sigreturn.S"