Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / pnacl / driver / pnacl-ld.py

diff --git a/src/native_client/pnacl/driver/pnacl-ld.py b/src/native_client/pnacl/driver/pnacl-ld.py
index e8d4f6e..40a03b4 100755 (executable)
--- a/src/native_client/pnacl/driver/pnacl-ld.py
+++ b/src/native_client/pnacl/driver/pnacl-ld.py
@@ -9,11 +9,14 @@
 # updates the copy in the toolchain/ tree.
 #
 
-from driver_tools import *
+from driver_tools import ArchMerge, DriverChain, GetArch, \
+    ParseArgs, ParseTriple, RunDriver, RunWithEnv, SetArch, \
+    SetExecutableMode, TempNameGen, UnrecognizedOption
 from driver_env import env
 from driver_log import Log
 import filetype
-import platform
+import ldtools
+import pathtools
 
 EXTRA_ENV = {
   'ALLOW_NATIVE': '0', # Allow LD args which will change the behavior
@@ -549,7 +552,7 @@ def CheckInputsArch(inputs):
       ArchMerge(f, True)
     else:
       Log.Fatal("%s: Unexpected type of file for linking (%s)",
-                pathtools.touser(f), FileType(f))
+                pathtools.touser(f), filetype.FileType(f))
     count += 1
 
   if count == 0: