summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2012-10-18 12:38:56 -0700
committerAaron Plattner <aplattner@nvidia.com>2012-10-18 12:38:56 -0700
commit3810c6fe98d68bda1d24b7d2d14f759577166941 (patch)
tree20e4190e8fcdfd74f03001197c7445414fbd6167
parentdbce8f63e9fa7d217fc0178e49961ca06837b7a9 (diff)
304.60304.60
-rw-r--r--utils.mk9
-rw-r--r--version.mk2
2 files changed, 10 insertions, 1 deletions
diff --git a/utils.mk b/utils.mk
index b912f98..6e5ec42 100644
--- a/utils.mk
+++ b/utils.mk
@@ -100,6 +100,15 @@ else
LIBDL_LIBS =
endif
+# This variable controls which floating-point ABI is targeted. For ARM, it
+# defaults to "gnueabi" for softfp. Another option is "gnueabihf" for
+# hard(fp). This is necessary to pick up the correct rtld_test binary.
+# All other architectures default to empty.
+ifeq ($(TARGET_ARCH),armv7l)
+ TARGET_ARCH_ABI ?= gnueabi
+endif
+TARGET_ARCH_ABI ?=
+
OUTPUTDIR ?= _out/$(TARGET_OS)_$(TARGET_ARCH)
NV_QUIET_COMMAND_REMOVED_TARGET_PREFIX ?=
diff --git a/version.mk b/version.mk
index 2335952..3fda853 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.51
+NVIDIA_VERSION = 304.60