diff options
Diffstat (limited to 'data/odcctools')
| l--------- | data/odcctools/_metadata/_ld64.dep | 1 | ||||
| -rw-r--r-- | data/odcctools/_metadata/version | 2 | ||||
| -rw-r--r-- | data/odcctools/cctools-895.tar.gz | bin | 0 -> 1716126 bytes | |||
| -rw-r--r-- | data/odcctools/fixes.diff | 24 | ||||
| -rw-r--r-- | data/odcctools/make.sh | 15 | ||||
| -rw-r--r-- | data/odcctools/odcctools-286.tgz | bin | 2353095 -> 0 bytes | |||
| -rw-r--r-- | data/odcctools/otool.diff | 76 | ||||
| -rw-r--r-- | data/odcctools/usrbin.diff | 32 | ||||
| -rw-r--r-- | data/odcctools/x86.diff | 65 |
9 files changed, 33 insertions, 182 deletions
diff --git a/data/odcctools/_metadata/_ld64.dep b/data/odcctools/_metadata/_ld64.dep new file mode 120000 index 000000000..030d8a67e --- /dev/null +++ b/data/odcctools/_metadata/_ld64.dep @@ -0,0 +1 @@ +../../_ld64
\ No newline at end of file diff --git a/data/odcctools/_metadata/version b/data/odcctools/_metadata/version index c20f65747..208931296 100644 --- a/data/odcctools/_metadata/version +++ b/data/odcctools/_metadata/version @@ -1 +1 @@ -286 +895 diff --git a/data/odcctools/cctools-895.tar.gz b/data/odcctools/cctools-895.tar.gz Binary files differnew file mode 100644 index 000000000..8f6e66a82 --- /dev/null +++ b/data/odcctools/cctools-895.tar.gz diff --git a/data/odcctools/fixes.diff b/data/odcctools/fixes.diff new file mode 100644 index 000000000..82a861957 --- /dev/null +++ b/data/odcctools/fixes.diff @@ -0,0 +1,24 @@ +diff -ur cctools-895/libmacho/Makefile cctools-895+iPhone/libmacho/Makefile +--- cctools-895/libmacho/Makefile 2016-12-09 08:02:59.000000000 -1000 ++++ cctools-895+iPhone/libmacho/Makefile 2018-09-05 10:18:21.000000000 -1000 +@@ -16,9 +16,7 @@ + LIBSYSCALL=-lsystem_kernel + endif + +-DEPENDENT_LIBS = -nodefaultlibs -umbrella System -L/usr/lib/system \ +- -ldyld -lsystem_malloc -lsystem_c $(LIBSYSCALL) \ +- -lcompiler_rt ++DEPENDENT_LIBS = -nodefaultlibs -umbrella System -L"${SDKROOT}/usr/lib/system" -lSystem + + ifneq "" "$(SDKROOT)" + SDK = -isysroot $(SDKROOT) +@@ -324,7 +322,7 @@ + install -c -m 555 dtmp_obj/libmacho.dylib \ + $(DSTROOT)$(DYLIBDIR)/libmacho.dylib; \ + $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib; \ +- install -c -m 555 dtmp_obj/libmacho_profile.dylib \ ++ install -c -m 555 ptmp_obj/libmacho_profile.dylib \ + $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib; \ + $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib; \ + install -c -m 555 dtmp_obj/libmacho_debug.dylib \ +Only in cctools-895+iPhone/libmacho: Makefile.orig diff --git a/data/odcctools/make.sh b/data/odcctools/make.sh index 9a1f484dc..18a41caab 100644 --- a/data/odcctools/make.sh +++ b/data/odcctools/make.sh @@ -1,9 +1,8 @@ pkg:setup -rm -f include/libkern/OSByteOrder.h -rm -f include/mach/{task,thread_act,thread_status}.h -rm -f include/mach/machine/{boolean,exception,kern_return,processor_info,rpc,thread_state,thread_status,vm_param,vm_types}.h -pkg:configure --enable-ld64 ac_cv_header_objc_objc_runtime_h=no -make -pkg:install -pkg: mv /usr/bin/ld{,_classic} -pkg: ln -s ld64 /usr/bin/ld +pkg: export RC_ProjectSourceVersion="$(cat ${PKG_DATA}/_metadata/version)" +pkg:make DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}" +pkg:install DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}" +pkg: rm -f /usr/lib/system/libmacho.dylib /usr/bin/{nm,otool,size} +pkg: mv -f /usr/bin/nm{-classic,} +pkg: mv -f /usr/bin/otool{-classic,} +pkg: mv -f /usr/bin/size{-classic,} diff --git a/data/odcctools/odcctools-286.tgz b/data/odcctools/odcctools-286.tgz Binary files differdeleted file mode 100644 index e8096aa3d..000000000 --- a/data/odcctools/odcctools-286.tgz +++ /dev/null diff --git a/data/odcctools/otool.diff b/data/odcctools/otool.diff deleted file mode 100644 index 3d5f28543..000000000 --- a/data/odcctools/otool.diff +++ /dev/null @@ -1,76 +0,0 @@ -diff -ru odcctools-277/include/foreign/objc/objc-api.h odcctools-277+iPhone/include/foreign/objc/objc-api.h ---- odcctools-277/include/foreign/objc/objc-api.h 2008-08-29 23:05:06.000000000 +0000 -+++ odcctools-277+iPhone/include/foreign/objc/objc-api.h 2008-08-30 00:26:47.000000000 +0000 -@@ -45,7 +45,7 @@ - /* OBJC2_UNAVAILABLE: unavailable in objc 2.0, deprecated in Leopard */ - #if !defined(OBJC2_UNAVAILABLE) - # if __OBJC2__ --# define OBJC2_UNAVAILABLE UNAVAILABLE_ATTRIBUTE -+# define OBJC2_UNAVAILABLE //UNAVAILABLE_ATTRIBUTE - # else - # define OBJC2_UNAVAILABLE DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER - # endif -diff -ru odcctools-277/include/foreign/objc/runtime.h odcctools-277+iPhone/include/foreign/objc/runtime.h ---- odcctools-277/include/foreign/objc/runtime.h 2008-08-29 23:05:06.000000000 +0000 -+++ odcctools-277+iPhone/include/foreign/objc/runtime.h 2008-08-30 00:25:34.000000000 +0000 -@@ -43,7 +43,7 @@ - struct objc_class { - Class isa; - --#if !__OBJC2__ -+#if 1//!__OBJC2__ - Class super_class OBJC2_UNAVAILABLE; - const char *name OBJC2_UNAVAILABLE; - long version OBJC2_UNAVAILABLE; -@@ -303,7 +303,7 @@ - - /* Obsolete types */ - --#if !__OBJC2__ -+#if 1//!__OBJC2__ - - #define CLS_GETINFO(cls,infomask) ((cls)->info & (infomask)) - #define CLS_SETINFO(cls,infomask) ((cls)->info |= (infomask)) -diff -ru odcctools-277/otool/Makefile.in odcctools-277+iPhone/otool/Makefile.in ---- odcctools-277/otool/Makefile.in 2008-08-29 22:38:32.000000000 +0000 -+++ odcctools-277+iPhone/otool/Makefile.in 2008-08-30 00:18:48.000000000 +0000 -@@ -24,8 +24,10 @@ - INCPRIVEXT = -include $(top_srcdir)/include/extern.h - endif - -+FOREIGN = -I$(top_srcdir)/include/foreign -+ - ifeq ($(HAVE_FOREIGN_HEADERS),YES) --FORHDRS = -I$(top_srcdir)/include/foreign -+FORHDRS = $(FOREIGN) - endif - - INSTALL = @INSTALL@ -@@ -77,9 +79,9 @@ - $(CC) -DOTOOL $(MYCOMPILEFLAGS) -DARCH64 -c -o $@ $< - - $(MOBJS): %.o: %.c -- $(CC) $(OBJC) $(MYCOMPILEFLAGS) -c -o $@ $< -+ $(CC) $(OBJC) $(MYCOMPILEFLAGS) $(FOREIGN) -c -o $@ $< - $(MOBJS64): %.64o: %.c -- $(CC) $(OBJC) $(MYCOMPILEFLAGS) -DARCH64 -c -o $@ $< -+ $(CC) $(OBJC) $(MYCOMPILEFLAGS) $(FOREIGN) -DARCH64 -c -o $@ $< - - install: otool otool64 - mkdir -p $(DESTDIR)$(bindir) -diff -ru odcctools-277/otool/print_objc.c odcctools-277+iPhone/otool/print_objc.c ---- odcctools-277/otool/print_objc.c 2008-08-29 22:38:32.000000000 +0000 -+++ odcctools-277+iPhone/otool/print_objc.c 2008-08-30 00:18:48.000000000 +0000 -@@ -39,7 +39,11 @@ - - struct objc_protocol - { -- @defs(Protocol) -+ Class isa; -+ char *protocol_name OBJC2_UNAVAILABLE; -+ struct objc_protocol_list *protocol_list OBJC2_UNAVAILABLE; -+ struct objc_method_description_list *instance_methods OBJC2_UNAVAILABLE; -+ struct objc_method_description_list *class_methods OBJC2_UNAVAILABLE; - }; - - /* diff --git a/data/odcctools/usrbin.diff b/data/odcctools/usrbin.diff deleted file mode 100644 index e5629d873..000000000 --- a/data/odcctools/usrbin.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru odcctools-286/as/driver.c odcctools-286+iPhone/as/driver.c ---- odcctools-286/as/driver.c 2008-07-24 19:20:04.000000000 +0000 -+++ odcctools-286+iPhone/as/driver.c 2009-06-30 03:46:53.000000000 +0000 -@@ -31,16 +31,16 @@ - const char *LIB = - #if defined(__OPENSTEP__) || defined(__HERA__) || \ - defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__) -- "../libexec/"; -+ "libexec/"; - #else -- "../libexec/gcc/darwin/"; -+ "libexec/gcc/darwin/"; - #endif - const char *LOCALLIB = - #if defined(__OPENSTEP__) || defined(__HERA__) || \ - defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__) -- "../local/libexec/"; -+ "local/libexec/"; - #else -- "../local/libexec/gcc/darwin/"; -+ "local/libexec/gcc/darwin/"; - #endif - const char *AS = "/as"; - -@@ -73,6 +73,7 @@ - p = rindex(prefix, '/'); - if(p != NULL) - p[1] = '\0'; -+ prefix = "/usr/"; - /* - * Process the assembler flags exactly like the assembler would (except - * let the assembler complain about multiple flags, bad combinations of diff --git a/data/odcctools/x86.diff b/data/odcctools/x86.diff deleted file mode 100644 index 1f383f646..000000000 --- a/data/odcctools/x86.diff +++ /dev/null @@ -1,65 +0,0 @@ -diff -ru odcctools-253/libstuff/bytesex.c odcctools-253+iPhone/libstuff/bytesex.c ---- odcctools-253/libstuff/bytesex.c 2008-07-21 18:58:48.000000000 +0000 -+++ odcctools-253+iPhone/libstuff/bytesex.c 2008-07-21 19:15:06.000000000 +0000 -@@ -1408,7 +1408,7 @@ - #endif /* x86_THREAD_STATE64 */ - - /* current i386 thread states */ --#if i386_THREAD_STATE == 1 -+#if i386_THREAD_STATE == 1 && 0 - __private_extern__ - void - swap_i386_float_state( -diff -ru odcctools-253/libstuff/swap_headers.c odcctools-253+iPhone/libstuff/swap_headers.c ---- odcctools-253/libstuff/swap_headers.c 2008-07-21 18:58:48.000000000 +0000 -+++ odcctools-253+iPhone/libstuff/swap_headers.c 2008-07-21 19:07:38.000000000 +0000 -@@ -635,13 +635,13 @@ - || cputype == CPU_TYPE_X86_64 - #endif /* x86_THREAD_STATE64 */ - ){ -- i386_thread_state_t *cpu; -+ x86_thread_state_t *cpu; - #ifdef x86_THREAD_STATE64 - x86_thread_state64_t *cpu64; - #endif /* x86_THREAD_STATE64 */ - /* current i386 thread states */ - #if i386_THREAD_STATE == 1 -- struct i386_float_state *fpu; -+ struct x86_float_state *fpu; - i386_exception_state_t *exc; - #endif /* i386_THREAD_STATE == 1 */ - -@@ -679,8 +679,8 @@ - "LC_THREAD", i); - return(FALSE); - } -- cpu = (i386_thread_state_t *)state; -- state += sizeof(i386_thread_state_t); -+ cpu = (x86_thread_state_t *)state; -+ state += sizeof(x86_thread_state_t); - break; - /* current i386 thread states */ - #if i386_THREAD_STATE == 1 -@@ -695,8 +695,8 @@ - "LC_THREAD", i); - return(FALSE); - } -- fpu = (struct i386_float_state *)state; -- state += sizeof(struct i386_float_state); -+ fpu = (struct x86_float_state *)state; -+ state += sizeof(struct x86_float_state); - break; - case i386_EXCEPTION_STATE: - if(count != I386_EXCEPTION_STATE_COUNT){ -@@ -1350,9 +1350,9 @@ - /* current i386 thread states */ - #if i386_THREAD_STATE == 1 - case i386_FLOAT_STATE: -- fpu = (struct i386_float_state *)state; -+ fpu = (struct x86_float_state *)state; - swap_i386_float_state(fpu, target_byte_sex); -- state += sizeof(struct i386_float_state); -+ state += sizeof(struct x86_float_state); - break; - case i386_EXCEPTION_STATE: - exc = (i386_exception_state_t *)state; |