You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/01/10 20:04:54 UTC

incubator-mynewt-newt git commit: newt - Remove obsolete split code.

Repository: incubator-mynewt-newt
Updated Branches:
  refs/heads/develop 401b6a93f -> e5dfa220f


newt - Remove obsolete split code.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/e5dfa220
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/e5dfa220
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/e5dfa220

Branch: refs/heads/develop
Commit: e5dfa220f8c050de0c50bb20bae130c248498400
Parents: 401b6a9
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jan 10 11:39:28 2017 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Jan 10 12:04:47 2017 -0800

----------------------------------------------------------------------
 newt/builder/targetbuild.go | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/e5dfa220/newt/builder/targetbuild.go
----------------------------------------------------------------------
diff --git a/newt/builder/targetbuild.go b/newt/builder/targetbuild.go
index 4d96c1f..072e0b8 100644
--- a/newt/builder/targetbuild.go
+++ b/newt/builder/targetbuild.go
@@ -453,15 +453,6 @@ func (t *TargetBuilder) RelinkLoader() (error, map[string]bool,
 		"Putting %d symbols from %d packages into loader\n",
 		len(*smMatch), len(commonPkgs))
 
-	/* This is worth a special comment.  We are building both apps as
-	 * stand-alone apps against the normal linker file, so they will both
-	 * have a Reset_Handler symbol.  We need to ignore this here.  When
-	 * we build the split app, we use a special linker file which
-	 * uses a different entry point */
-	specialSm := symbol.NewSymbolMap()
-	specialSm.Add(*symbol.NewElfSymbol("Reset_Handler(app)"))
-	specialSm.Add(*symbol.NewElfSymbol("Reset_Handler(loader)"))
-
 	var badpkgs []string
 	var symbolStr string
 	for v, _ := range uncommonPkgs {
@@ -474,10 +465,8 @@ func (t *TargetBuilder) RelinkLoader() (error, map[string]bool,
 
 			var found bool
 			for _, sym := range *trouble {
-				if _, ok := specialSm.Find(sym.Name); !ok {
-					if !sym.IsLocal() {
-						found = true
-					}
+				if !sym.IsLocal() {
+					found = true
 				}
 			}