Created
March 5, 2013 11:41
-
-
Save jpf91/5089734 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/bfd/Makefile.am b/bfd/Makefile.am | |
index 9ab2aa9..840d9cc 100644 | |
--- a/bfd/Makefile.am | |
+++ b/bfd/Makefile.am | |
@@ -35,7 +35,7 @@ AM_CFLAGS = $(WARN_CFLAGS) | |
AM_CPPFLAGS = -DBINDIR='"$(bindir)"' | |
if PLUGINS | |
bfdinclude_HEADERS += $(INCDIR)/plugin-api.h | |
-LIBDL = -ldl | |
+LIBDL = @lt_cv_dlopen_libs@ | |
endif | |
# bfd.h goes here, for now | |
diff --git a/bfd/Makefile.in b/bfd/Makefile.in | |
index 9990275..b287d6a 100644 | |
--- a/bfd/Makefile.in | |
+++ b/bfd/Makefile.in | |
@@ -293,6 +293,7 @@ libdir = @libdir@ | |
libexecdir = @libexecdir@ | |
localedir = @localedir@ | |
localstatedir = @localstatedir@ | |
+lt_cv_dlopen_libs = @lt_cv_dlopen_libs@ | |
mandir = @mandir@ | |
mkdir_p = @mkdir_p@ | |
oldincludedir = @oldincludedir@ | |
@@ -336,7 +337,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ | |
@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la | |
AM_CFLAGS = $(WARN_CFLAGS) | |
AM_CPPFLAGS = -DBINDIR='"$(bindir)"' | |
-@PLUGINS_TRUE@LIBDL = -ldl | |
+@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ | |
# bfd.h goes here, for now | |
BFD_H = bfd.h | |
diff --git a/bfd/configure b/bfd/configure | |
index aa26f20..444c7b0 100755 | |
--- a/bfd/configure | |
+++ b/bfd/configure | |
@@ -606,6 +606,7 @@ havevecs | |
tdefaults | |
bfd_ufile_ptr | |
bfd_file_ptr | |
+lt_cv_dlopen_libs | |
supports_plugins | |
bfd_default_target_size | |
bfd_machines | |
@@ -15622,6 +15623,7 @@ else | |
fi | |
+ | |
# Determine the host dependant file_ptr a.k.a. off_t type. In order | |
# prefer: off64_t - if ftello64 and fseeko64, off_t - if ftello and | |
# fseeko, long. This assumes that sizeof off_t is .ge. sizeof long. | |
diff --git a/bfd/configure.in b/bfd/configure.in | |
index 5930bd8..4ff82b9 100644 | |
--- a/bfd/configure.in | |
+++ b/bfd/configure.in | |
@@ -1099,6 +1099,7 @@ else | |
supports_plugins=0 | |
fi | |
AC_SUBST(supports_plugins) | |
+AC_SUBST(lt_cv_dlopen_libs) | |
# Determine the host dependant file_ptr a.k.a. off_t type. In order | |
# prefer: off64_t - if ftello64 and fseeko64, off_t - if ftello and | |
diff --git a/include/opcode/arm.h b/include/opcode/arm.h | |
index 1ac38a0..7e11545 100644 | |
--- a/include/opcode/arm.h | |
+++ b/include/opcode/arm.h | |
@@ -113,7 +113,8 @@ | |
#define ARM_AEXT_V6KT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K) | |
#define ARM_AEXT_V6ZT2 (ARM_AEXT_V6T2 | ARM_EXT_SEC) | |
#define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_SEC) | |
-#define ARM_AEXT_V7_ARM (ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER) | |
+#define ARM_AEXT_V7_ARM (ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER \ | |
+ | ARM_EXT_OS ) | |
#define ARM_AEXT_V7A (ARM_AEXT_V7_ARM | ARM_EXT_V7A) | |
#define ARM_AEXT_V7R (ARM_AEXT_V7_ARM | ARM_EXT_V7R | ARM_EXT_DIV) | |
#define ARM_AEXT_NOTM \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment