diff options
Diffstat (limited to 'dev-util/emilpro/files')
| -rw-r--r-- | dev-util/emilpro/files/emilpro-3-system-binutils.patch | 48 | ||||
| -rw-r--r-- | dev-util/emilpro/files/emilpro-9999-system-binutils.patch | 52 | ||||
| -rw-r--r-- | dev-util/emilpro/files/or1k-2.patch | 22 | ||||
| -rw-r--r-- | dev-util/emilpro/files/or1k.patch | 70 | ||||
| -rw-r--r-- | dev-util/emilpro/files/respect-cflags.patch | 12 |
5 files changed, 204 insertions, 0 deletions
diff --git a/dev-util/emilpro/files/emilpro-3-system-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch new file mode 100644 index 000000000000..d73f402a3005 --- /dev/null +++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch @@ -0,0 +1,48 @@ +diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt +--- emilpro-3-orig/CMakeLists.txt 2016-03-29 13:19:47.035441401 -0400 ++++ emilpro-3/CMakeLists.txt 2016-03-29 13:18:36.650443067 -0400 +@@ -11,7 +11,6 @@ + set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + # Dependencies +-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake) + + find_package (LibElf REQUIRED) + find_package (PkgConfig REQUIRED) +@@ -30,7 +29,6 @@ + pkg_check_modules(LIBCURL libcurl) + + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") +-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64) + + if (HAVE_BFD_MULTIARCH) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH") +@@ -110,7 +108,6 @@ + src/include/ + ${CMAKE_BINARY_DIR} + ${LIBELF_INCLUDE_DIRS} +- ${CMAKE_BINARY_DIR}/install-binutils/include/ + ${GTKMM_INCLUDE_DIRS} + ${GTKSOURCEVIEWMM_INCLUDE_DIRS} + ${LIBXMLPP_INCLUDE_DIRS} +@@ -128,8 +125,6 @@ + tools/squash-instruction-models.cc + ) + +-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils) +-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils) + + set (BASE_LIBS + ${LIBELF_LIBRARIES} +diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc +--- emilpro-3-orig/src/namemangler.cc 2016-03-29 13:17:23.957444786 -0400 ++++ emilpro-3/src/namemangler.cc 2016-03-29 13:18:57.306442578 -0400 +@@ -1,7 +1,7 @@ + #include <namemangler.hh> + + #include <bfd.h> +-#include <demangle.h> ++#include <libiberty/demangle.h> + + using namespace emilpro; + diff --git a/dev-util/emilpro/files/emilpro-9999-system-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch new file mode 100644 index 000000000000..194e8d10b6e4 --- /dev/null +++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch @@ -0,0 +1,52 @@ +diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt +--- emilpro-9999-orig/CMakeLists.txt 2016-03-29 14:30:48.017340585 -0400 ++++ emilpro-9999/CMakeLists.txt 2016-03-29 14:31:21.335339797 -0400 +@@ -11,7 +11,6 @@ + set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + # Dependencies +-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake) + + find_package (LibElf REQUIRED) + find_package (LibCapstone) +@@ -40,10 +39,6 @@ + pkg_check_modules(LIBCURL REQUIRED libcurl) + + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread") +-LINK_DIRECTORIES( +- ${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64 +- ${CMAKE_BINARY_DIR}/binutils/libiberty +- ) + + if (HAVE_BFD_MULTIARCH) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH") +@@ -120,7 +115,6 @@ + set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh) + + include_directories( +- ${CMAKE_BINARY_DIR}/install-binutils/include/ + src/gtk/include/ + src/include/ + ${CMAKE_BINARY_DIR} +@@ -143,9 +137,6 @@ + tools/squash-instruction-models.cc + ) + +-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils) +-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils) +- + set (BASE_LIBS + ${LIBELF_LIBRARIES} + opcodes +diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc +--- emilpro-9999-orig/src/namemangler.cc 2016-03-29 14:30:48.017340585 -0400 ++++ emilpro-9999/src/namemangler.cc 2016-03-29 14:31:06.397340150 -0400 +@@ -1,7 +1,7 @@ + #include <namemangler.hh> + + #include <bfd.h> +-#include <demangle.h> ++#include <libiberty/demangle.h> + + using namespace emilpro; + diff --git a/dev-util/emilpro/files/or1k-2.patch b/dev-util/emilpro/files/or1k-2.patch new file mode 100644 index 000000000000..9dd4e195342a --- /dev/null +++ b/dev-util/emilpro/files/or1k-2.patch @@ -0,0 +1,22 @@ +From 5b41e51bfb9fdeac7c6a2441badf8c3b92463fef Mon Sep 17 00:00:00 2001 +From: Alex Chernetz <andy80586@gmail.com> +Date: Fri, 1 May 2015 14:34:31 -0700 +Subject: [PATCH] Function is print_insn_or1k, not print_insn_little_or1k + +--- + src/bfd-disassembly.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc +index bf3e768..eeecbe4 100644 +--- a/src/bfd-disassembly.cc ++++ b/src/bfd-disassembly.cc +@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly, + m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k); /* Motorola 68xxx */ + m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax); /* DEC Vax */ + m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960); /* Intel 960 */ +- m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k); /* OpenRISC 32 */ ++ m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_or1k); /* OpenRISC 32 */ + m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc); /* SPARC */ + m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu); /* PowerPC SPU */ + m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860); /* Intel 860 */ diff --git a/dev-util/emilpro/files/or1k.patch b/dev-util/emilpro/files/or1k.patch new file mode 100644 index 000000000000..e7a4392f0bdb --- /dev/null +++ b/dev-util/emilpro/files/or1k.patch @@ -0,0 +1,70 @@ +From f59c5f424a268313c1fcc009fd1e40c00bf6c4f2 Mon Sep 17 00:00:00 2001 +From: Alex Chernetz <andy80586@gmail.com> +Date: Fri, 1 May 2015 13:32:27 -0700 +Subject: [PATCH] or32 and openrisc architectures are replaced by or1k in + current binutils + +--- + src/architecturefactory.cc | 6 ++---- + src/bfd-disassembly.cc | 3 +-- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/architecturefactory.cc b/src/architecturefactory.cc +index 709b770..25ccf80 100644 +--- a/src/architecturefactory.cc ++++ b/src/architecturefactory.cc +@@ -10,7 +10,7 @@ ArchitectureFactory::ArchitectureFactory() : + m_architectureNameMap[(unsigned)bfd_arch_m68k] = "m68k"; + m_architectureNameMap[(unsigned)bfd_arch_vax] = "vax"; + m_architectureNameMap[(unsigned)bfd_arch_i960] = "i960"; +- m_architectureNameMap[(unsigned)bfd_arch_or32] = "or32"; ++ m_architectureNameMap[(unsigned)bfd_arch_or1k] = "or1k"; + m_architectureNameMap[(unsigned)bfd_arch_sparc] = "sparc"; + m_architectureNameMap[(unsigned)bfd_arch_mips] = "mips"; + m_architectureNameMap[(unsigned)bfd_arch_i386] = "i386"; +@@ -68,7 +68,6 @@ ArchitectureFactory::ArchitectureFactory() : + m_architectureNameMap[(unsigned)bfd_arch_cris] = "cris"; + m_architectureNameMap[(unsigned)bfd_arch_s390] = "s390"; + m_architectureNameMap[(unsigned)bfd_arch_score] = "score"; +- m_architectureNameMap[(unsigned)bfd_arch_openrisc] = "openrisc"; + m_architectureNameMap[(unsigned)bfd_arch_mmix] = "mmix"; + m_architectureNameMap[(unsigned)bfd_arch_xstormy16] = "xstormy16"; + m_architectureNameMap[(unsigned)bfd_arch_xc16x] = "xc16x"; +@@ -81,7 +80,7 @@ ArchitectureFactory::ArchitectureFactory() : + m_nameArchitectureMap["m68k"] = (unsigned)bfd_arch_m68k; + m_nameArchitectureMap["vax"] = (unsigned)bfd_arch_vax; + m_nameArchitectureMap["i960"] = (unsigned)bfd_arch_i960; +- m_nameArchitectureMap["or32"] = (unsigned)bfd_arch_or32; ++ m_nameArchitectureMap["or1k"] = (unsigned)bfd_arch_or1k; + m_nameArchitectureMap["sparc"] = (unsigned)bfd_arch_sparc; + m_nameArchitectureMap["mips"] = (unsigned)bfd_arch_mips; + m_nameArchitectureMap["i386"] = (unsigned)bfd_arch_i386; +@@ -139,7 +138,6 @@ ArchitectureFactory::ArchitectureFactory() : + m_nameArchitectureMap["cris"] = (unsigned)bfd_arch_cris; + m_nameArchitectureMap["s390"] = (unsigned)bfd_arch_s390; + m_nameArchitectureMap["score"] = (unsigned)bfd_arch_score; +- m_nameArchitectureMap["openrisc"] = (unsigned)bfd_arch_openrisc; + m_nameArchitectureMap["mmix"] = (unsigned)bfd_arch_mmix; + m_nameArchitectureMap["xstormy16"] = (unsigned)bfd_arch_xstormy16; + m_nameArchitectureMap["xc16x"] = (unsigned)bfd_arch_xc16x; +diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc +index 5cda9e2..bf3e768 100644 +--- a/src/bfd-disassembly.cc ++++ b/src/bfd-disassembly.cc +@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly, + m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k); /* Motorola 68xxx */ + m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax); /* DEC Vax */ + m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960); /* Intel 960 */ +- m_arch[bfd_arch_or32] = BfdArch(bfd_arch_or32, 0, print_insn_little_or32); /* OpenRISC 32 */ ++ m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k); /* OpenRISC 32 */ + m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc); /* SPARC */ + m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu); /* PowerPC SPU */ + m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860); /* Intel 860 */ +@@ -89,7 +89,6 @@ class Disassembly : public IDisassembly, + m_arch[bfd_arch_rl78] = BfdArch(bfd_arch_rl78, 0, print_insn_rl78); + m_arch[bfd_arch_rx] = BfdArch(bfd_arch_rx, 0, print_insn_rx); /* Renesas RX. */ + m_arch[bfd_arch_s390] = BfdArch(bfd_arch_s390, bfd_mach_s390_64, print_insn_s390); /* IBM s390 */ +- m_arch[bfd_arch_openrisc] = BfdArch(bfd_arch_openrisc, 0, print_insn_openrisc); /* OpenRISC */ + m_arch[bfd_arch_mmix] = BfdArch(bfd_arch_mmix, 0, print_insn_mmix); /* Donald Knuth's educational processor. */ + m_arch[bfd_arch_xstormy16] = BfdArch(bfd_arch_xstormy16, 0, print_insn_xstormy16); + m_arch[bfd_arch_msp430] = BfdArch(bfd_arch_msp430, 0, print_insn_msp430); /* Texas Instruments MSP430 architecture. */ diff --git a/dev-util/emilpro/files/respect-cflags.patch b/dev-util/emilpro/files/respect-cflags.patch new file mode 100644 index 000000000000..12d5bd52db5d --- /dev/null +++ b/dev-util/emilpro/files/respect-cflags.patch @@ -0,0 +1,12 @@ +diff -Naur emilpro-3/CMakeLists.txt emilpro-3-cflags/CMakeLists.txt +--- emilpro-3/CMakeLists.txt 2013-12-28 04:22:34.000000000 -0500 ++++ emilpro-3-cflags/CMakeLists.txt 2014-03-18 17:59:47.534542384 -0400 +@@ -29,7 +29,7 @@ + pkg_check_modules(LIBXMLPP libxml++-2.6) + pkg_check_modules(LIBCURL libcurl) + +-set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") + LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64) + + if (HAVE_BFD_MULTIARCH) |