Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7035
b: refs/heads/master
c: 30f7dab
h: refs/heads/master
i:
  7033: 746db75
  7031: 84b744e
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 5, 2005
1 parent 5435b47 commit d36e0e2
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e32dacb9f481fd6decb41adb28e720c923d34f54
refs/heads/master: 30f7dabb083f8ff4ce541b5ac4e5d70cc173051a
2 changes: 1 addition & 1 deletion trunk/arch/um/Makefile-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ START := 0x60000000

#We #undef __x86_64__ for kernelspace, not for userspace where
#it's needed for headers to work!
CFLAGS += -U__$(SUBARCH)__ -fno-builtin $(STUB_CFLAGS)
CFLAGS += -U__$(SUBARCH)__ -fno-builtin
USER_CFLAGS += -fno-builtin

ELF_ARCH := i386:x86-64
Expand Down
6 changes: 1 addition & 5 deletions trunk/arch/um/sys-i386/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ semaphore.c-dir = kernel
highmem.c-dir = mm
module.c-dir = kernel

STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS))

# _cflags works with kernel files, not with userspace ones, but c_flags does,
# why ask why?
$(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS)
$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))

subdir- := util

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/um/sys-i386/stub_segv.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
* Licensed under the GPL
*/

#include <signal.h>
#include <asm/sigcontext.h>
#include <asm/signal.h>
#include <asm/unistd.h>
#include "uml-config.h"
#include "sysdep/sigcontext.h"
Expand Down
6 changes: 1 addition & 5 deletions trunk/arch/um/sys-x86_64/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ memcpy.S-dir = lib
thunk.S-dir = lib
module.c-dir = kernel

STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS))

# _cflags works with kernel files, not with userspace ones, but c_flags does,
# why ask why?
$(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS)
$(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))

subdir- := util

Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/um/sys-x86_64/stub_segv.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
* Licensed under the GPL
*/

#include <signal.h>
#include <asm/signal.h>
#include <linux/compiler.h>
#include <asm/unistd.h>
#include <asm/ucontext.h>
#include "uml-config.h"
#include "sysdep/sigcontext.h"
#include "sysdep/faultinfo.h"
Expand Down

0 comments on commit d36e0e2

Please sign in to comment.