[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] haiku: hrev49734 - build/jam
From:       jerome.duval () gmail ! com
Date:       2015-10-29 17:09:19
Message-ID: 20151029170919.BBC895C2160 () vmrepo ! haiku-os ! org
[Download RAW message or body]

hrev49734 adds 1 changeset to branch 'master'
old head: c4d22bb93335914504386f14fef0123f1c366427
new head: 9e5091d7a3240c8c58f02c853feee6388d0b1d0d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9e5091d7a324+%5Ec4d22bb93335

----------------------------------------------------------------------------

9e5091d7a324: Build without linker warnings about missing entry symbols.
  
  * BootRules: Use -Xlinker option correctly to specify entry point.
  * KernelRules: Build kernel add-ons as shared objects explicitly.
  
  Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>

                                     [ Simon South <ssouth@simonsouth.com> ]

----------------------------------------------------------------------------

Revision:    hrev49734
Commit:      9e5091d7a3240c8c58f02c853feee6388d0b1d0d
URL:         http://cgit.haiku-os.org/haiku/commit/?id=9e5091d7a324
Author:      Simon South <ssouth@simonsouth.com>
Date:        Thu Oct 29 00:10:43 2015 UTC
Committer:   Jérôme Duval <jerome.duval@gmail.com>
Commit-Date: Thu Oct 29 15:59:59 2015 UTC

----------------------------------------------------------------------------

2 files changed, 2 insertions(+), 2 deletions(-)
build/jam/BootRules   | 2 +-
build/jam/KernelRules | 2 +-

----------------------------------------------------------------------------

diff --git a/build/jam/BootRules b/build/jam/BootRules
index e66a6f9..63efcc5 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -145,5 +145,5 @@ rule BuildMBR binary : source
 actions BuildMBR
 {
 	$(RM) $(1)
-	$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) $(2) -o $(1) $(MBRFLAGS) -nostdlib -Xlinker \
--oformat=binary -Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600" \
+	$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) $(2) -o $(1) $(MBRFLAGS) -nostdlib -Xlinker \
--oformat=binary -Xlinker -S -Xlinker -N -Xlinker --entry=start -Xlinker -Ttext=0x600 \
                }
diff --git a/build/jam/KernelRules b/build/jam/KernelRules
index 7fc8b47..11fda4f 100644
--- a/build/jam/KernelRules
+++ b/build/jam/KernelRules
@@ -139,7 +139,7 @@ rule KernelAddon
 
 	# compile and link
 	SetupKernel $(sources) : : false ;
-	local linkFlags = -nostdlib -Xlinker --no-undefined
+	local linkFlags = -shared -nostdlib -Xlinker --no-undefined
 		-Xlinker -soname=\"$(target:G=)\" $(TARGET_KERNEL_ADDON_LINKFLAGS) ;
 	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
 	Main $(target) : $(sources) ;


[prev in list] [next in list] [prev in thread] [next in thread]