mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-03-22 01:54:32 -05:00
163 lines
5.2 KiB
Diff
163 lines
5.2 KiB
Diff
diff -Nbaur binutils-2.22/bfd/bfd-in2.h binutils-2.22-arm/bfd/bfd-in2.h
|
||
--- binutils-2.22/bfd/bfd-in2.h 2011-09-16 02:15:18.000000000 +0100
|
||
+++ binutils-2.22-arm/bfd/bfd-in2.h 2012-04-01 12:58:20.000000000 +0100
|
||
@@ -38,6 +38,8 @@
|
||
|
||
#include "ansidecl.h"
|
||
#include "symcat.h"
|
||
+#include <sys/stat.h>
|
||
+
|
||
#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
|
||
#ifndef SABER
|
||
/* This hack is to avoid a problem with some strict ANSI C preprocessors.
|
||
@@ -308,8 +310,6 @@
|
||
&& (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \
|
||
&& (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
|
||
|
||
-/* Forward define. */
|
||
-struct stat;
|
||
|
||
typedef enum bfd_print_symbol
|
||
{
|
||
diff -Nbaur binutils-2.22/bfd/bfd-in.h binutils-2.22-arm/bfd/bfd-in.h
|
||
--- binutils-2.22/bfd/bfd-in.h 2011-09-16 02:15:18.000000000 +0100
|
||
+++ binutils-2.22-arm/bfd/bfd-in.h 2012-04-01 12:58:20.000000000 +0100
|
||
@@ -31,6 +31,8 @@
|
||
|
||
#include "ansidecl.h"
|
||
#include "symcat.h"
|
||
+#include <sys/stat.h>
|
||
+
|
||
#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
|
||
#ifndef SABER
|
||
/* This hack is to avoid a problem with some strict ANSI C preprocessors.
|
||
@@ -301,8 +303,6 @@
|
||
&& (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \
|
||
&& (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
|
||
|
||
-/* Forward define. */
|
||
-struct stat;
|
||
|
||
typedef enum bfd_print_symbol
|
||
{
|
||
diff -Nbaur binutils-2.22/bfd/config.in binutils-2.22-arm/bfd/config.in
|
||
--- binutils-2.22/bfd/config.in 2011-05-12 08:41:40.000000000 +0100
|
||
+++ binutils-2.22-arm/bfd/config.in 2012-04-03 17:35:45.000000000 +0100
|
||
@@ -245,6 +245,9 @@
|
||
/* Define if <sys/procfs.h> has win32_pstatus_t. */
|
||
#undef HAVE_WIN32_PSTATUS_T
|
||
|
||
+/* Define to 1 if you have the <windows.h> header file. */
|
||
+#undef HAVE_WINDOWS_H
|
||
+
|
||
/* Define to 1 if you have the <zlib.h> header file. */
|
||
#undef HAVE_ZLIB_H
|
||
|
||
diff -Nbaur binutils-2.22/bfd/configure binutils-2.22-arm/bfd/configure
|
||
--- binutils-2.22/bfd/configure 2011-11-21 11:55:48.000000000 +0000
|
||
+++ binutils-2.22-arm/bfd/configure 2012-04-03 17:35:45.000000000 +0100
|
||
@@ -13508,6 +13508,22 @@
|
||
|
||
fi
|
||
|
||
+
|
||
+for ac_header in windows.h dlfcn.h
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
+ cat >>confdefs.h <<_ACEOF
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+_ACEOF
|
||
+
|
||
+fi
|
||
+
|
||
+done
|
||
+
|
||
+
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
|
||
$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
|
||
if test "${gcc_cv_header_string+set}" = set; then :
|
||
diff -Nbaur binutils-2.22/bfd/configure.in binutils-2.22-arm/bfd/configure.in
|
||
--- binutils-2.22/bfd/configure.in 2011-11-21 11:55:46.000000000 +0000
|
||
+++ binutils-2.22-arm/bfd/configure.in 2012-04-03 17:35:45.000000000 +0100
|
||
@@ -190,6 +190,9 @@
|
||
GCC_HEADER_STDINT(bfd_stdint.h)
|
||
AC_HEADER_TIME
|
||
AC_HEADER_DIRENT
|
||
+
|
||
+AC_CHECK_HEADERS(windows.h dlfcn.h)
|
||
+
|
||
ACX_HEADER_STRING
|
||
AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
|
||
AC_CHECK_FUNCS(strtoull)
|
||
diff -Nbaur binutils-2.22/bfd/plugin.c binutils-2.22-arm/bfd/plugin.c
|
||
--- binutils-2.22/bfd/plugin.c 2011-07-11 16:03:07.000000000 +0100
|
||
+++ binutils-2.22-arm/bfd/plugin.c 2012-04-03 17:35:45.000000000 +0100
|
||
@@ -25,7 +25,13 @@
|
||
#if BFD_SUPPORTS_PLUGINS
|
||
|
||
#include <assert.h>
|
||
+#ifdef HAVE_DLFCN_H
|
||
#include <dlfcn.h>
|
||
+#elif defined (HAVE_WINDOWS_H)
|
||
+#include <windows.h>
|
||
+#else
|
||
+#error Unknown how to handle dynamic-load-libraries.
|
||
+#endif
|
||
#include <stdarg.h>
|
||
#include "plugin-api.h"
|
||
#include "sysdep.h"
|
||
@@ -34,6 +40,37 @@
|
||
#include "libiberty.h"
|
||
#include <dirent.h>
|
||
|
||
+#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)
|
||
+
|
||
+#define RTLD_NOW 0 /* Dummy value. */
|
||
+
|
||
+static void *
|
||
+dlopen (const char *file, int mode ATTRIBUTE_UNUSED)
|
||
+{
|
||
+ return LoadLibrary (file);
|
||
+}
|
||
+
|
||
+static void *
|
||
+dlsym (void *handle, const char *name)
|
||
+{
|
||
+ return GetProcAddress (handle, name);
|
||
+}
|
||
+
|
||
+static int ATTRIBUTE_UNUSED
|
||
+dlclose (void *handle)
|
||
+{
|
||
+ FreeLibrary (handle);
|
||
+ return 0;
|
||
+}
|
||
+
|
||
+static const char *
|
||
+dlerror (void)
|
||
+{
|
||
+ return "Unable to load DLL.";
|
||
+}
|
||
+
|
||
+#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) */
|
||
+
|
||
#define bfd_plugin_close_and_cleanup _bfd_generic_close_and_cleanup
|
||
#define bfd_plugin_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
|
||
#define bfd_plugin_new_section_hook _bfd_generic_new_section_hook
|
||
diff -Nbaur binutils-2.22/include/opcode/arm.h binutils-2.22-arm/include/opcode/arm.h
|
||
--- binutils-2.22/include/opcode/arm.h 2011-05-31 15:12:55.000000000 +0100
|
||
+++ binutils-2.22-arm/include/opcode/arm.h 2012-04-01 12:58:20.000000000 +0100
|
||
@@ -109,7 +109,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 \
|