diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
| commit | 76df73ff90e99681a99e457aec4cfe0a240b7982 (patch) | |
| tree | 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a /arch/um/Makefile-i386 | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| parent | 86bc843a268058df558844b6bf64531617fbc698 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/um/Makefile-i386')
| -rw-r--r-- | arch/um/Makefile-i386 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 7a0e04e34bf9..b65ca115ef77 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 | |||
| @@ -33,5 +33,9 @@ include $(srctree)/arch/i386/Makefile.cpu | |||
| 33 | # prevent gcc from keeping the stack 16 byte aligned. Taken from i386. | 33 | # prevent gcc from keeping the stack 16 byte aligned. Taken from i386. |
| 34 | cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) | 34 | cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) |
| 35 | 35 | ||
| 36 | # Prevent sprintf in nfsd from being converted to strcpy and resulting in | ||
| 37 | # an unresolved reference. | ||
| 38 | cflags-y += -ffreestanding | ||
| 39 | |||
| 36 | CFLAGS += $(cflags-y) | 40 | CFLAGS += $(cflags-y) |
| 37 | USER_CFLAGS += $(cflags-y) | 41 | USER_CFLAGS += $(cflags-y) |