linux-um archives
 help / color / mirror / Atom feed
* [uml-devel] [PATCH 1/2] uml: arch/um/scripts/Makefile.rules - remove duplicated code
@ 2005-11-20 19:10 Paolo 'Blaisorblade' Giarrusso
  2005-11-20 19:10 ` [uml-devel] [PATCH 2/2] uml: fix dynamic linking on some 64-bit distros Paolo 'Blaisorblade' Giarrusso
  0 siblings, 1 reply; 2+ messages in thread
From: Paolo 'Blaisorblade' Giarrusso @ 2005-11-20 19:10 UTC (permalink / raw)
  To: Linus Torvalds, Andrew Morton
  Cc: Jeff Dike, linux-kernel, user-mode-linux-devel

From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Duplicated code - the patch adding it was probably applied twice without enough
care.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 arch/um/scripts/Makefile.rules |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index b3fbf12..2e41cab 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -21,11 +21,6 @@ define unprofile
 endef
 
 
-# The stubs and unmap.o can't try to call mcount or update basic block data
-define unprofile
-	$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
-endef
-
 # cmd_make_link checks to see if the $(foo-dir) variable starts with a /.  If
 # so, it's considered to be a path relative to $(srcdir) rather than
 # $(srcdir)/arch/$(SUBARCH).  This is because x86_64 wants to get ldt.c from



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [uml-devel] [PATCH 2/2] uml: fix dynamic linking on some 64-bit distros
  2005-11-20 19:10 [uml-devel] [PATCH 1/2] uml: arch/um/scripts/Makefile.rules - remove duplicated code Paolo 'Blaisorblade' Giarrusso
@ 2005-11-20 19:10 ` Paolo 'Blaisorblade' Giarrusso
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo 'Blaisorblade' Giarrusso @ 2005-11-20 19:10 UTC (permalink / raw)
  To: Linus Torvalds, Andrew Morton
  Cc: Jeff Dike, linux-kernel, user-mode-linux-devel

From: Rob Landley <rob@landley.net>, Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

The current UML build assumes that on x86-64 systems, /lib is a symlink 
to /lib64, but in some distributions (like PLD and CentOS) they are separate 
directories, so the 64 bit library loader isn't found.  This patch 
inserts /lib64 at the start of the rpath on x86-64 UML builds.

Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 arch/um/Makefile-x86_64 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5..38df311 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -12,3 +12,7 @@ CHECKFLAGS  += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
+
+# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
+
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-11-20 20:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-20 19:10 [uml-devel] [PATCH 1/2] uml: arch/um/scripts/Makefile.rules - remove duplicated code Paolo 'Blaisorblade' Giarrusso
2005-11-20 19:10 ` [uml-devel] [PATCH 2/2] uml: fix dynamic linking on some 64-bit distros Paolo 'Blaisorblade' Giarrusso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox