From: Rob Landley <rob@landley.net>
To: user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] [patch] Remove unnecessary config symbol from makefile.
Date: Thu, 17 Mar 2005 02:19:38 -0500 [thread overview]
Message-ID: <200503170219.38388.rob@landley.net> (raw)
There can be only one!
Signed-off-by: Rob Landley <rob@landley.net>
diff -ur linux-2.6.11/arch/um/Kconfig linux-2.6.11.new/arch/um/Kconfig
--- linux-2.6.11/arch/um/Kconfig 2005-03-02 01:38:09.000000000 -0600
+++ linux-2.6.11.new/arch/um/Kconfig 2005-03-16 17:38:54.000000000 -0600
@@ -75,11 +75,6 @@
default y
depends on MODE_TT || STATIC_LINK
-config LD_SCRIPT_DYN
- bool
- default y
- depends on !LD_SCRIPT_STATIC
-
config NET
bool "Networking support"
help
diff -ur linux-2.6.11/arch/um/Makefile linux-2.6.11.new/arch/um/Makefile
--- linux-2.6.11/arch/um/Makefile 2005-03-02 01:38:12.000000000 -0600
+++ linux-2.6.11.new/arch/um/Makefile 2005-03-16 17:55:36.997564112 -0600
@@ -90,7 +90,7 @@
define archhelp
echo '* linux - Binary kernel image (./linux) - for backward'
echo ' compatibility only, this creates a hard link to the'
- echo ' real kernel binary, the the "vmlinux" binary you'
+ echo ' real kernel binary, the "vmlinux" binary you'
echo ' find in the kernel root.'
endef
@@ -99,11 +99,8 @@
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
$(ARCH_DIR)/kernel/vmlinux.lds.S
-LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
-
-LD_SCRIPT-$(CONFIG_LD_SCRIPT_STATIC) := uml.lds.S
-LD_SCRIPT-$(CONFIG_LD_SCRIPT_DYN) := dyn.lds.S
+LINK-y += $(if $(CONFIG_LD_SCRIPT_STATIC),-static,-Wl,-rpath,/lib)
+LD_SCRIPT-y += $(if $(CONFIG_LD_SCRIPT_STATIC),uml.lds.S,dyn.lds.S)
CPP_MODE-$(CONFIG_MODE_TT) := -DMODE_TT
CONFIG_KERNEL_STACK_ORDER ?= 2
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next reply other threads:[~2005-03-17 8:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-17 7:19 Rob Landley [this message]
2005-03-17 19:22 ` [uml-devel] [patch] Remove unnecessary config symbol from makefile Blaisorblade
2005-03-17 23:59 ` Rob Landley
2005-03-20 10:42 ` Blaisorblade
2005-03-20 22:24 ` Rob Landley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200503170219.38388.rob@landley.net \
--to=rob@landley.net \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.