[Odcctools-changes] [142] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Sep 11 20:59:38 PDT 2006
Revision: 142
Author: ssen at mit.edu
Date: 2006-09-11 20:59:36 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
update patches and files
Modified Paths:
--------------
trunk/extract.sh
trunk/files/configure.ac
trunk/patches/ld/relocate-ld64.diff
trunk/patches/ld64/MachOReaderRelocatable-ctz.diff
Modified: trunk/extract.sh
===================================================================
--- trunk/extract.sh 2006-09-12 03:36:05 UTC (rev 141)
+++ trunk/extract.sh 2006-09-12 03:59:36 UTC (rev 142)
@@ -3,11 +3,11 @@
set -e
CCTOOLSNAME=cctools
-CCTOOLSVERS=590.42.1
+CCTOOLSVERS=622.3
CCTOOLSDISTFILE=${CCTOOLSNAME}-${CCTOOLSVERS}.tar.bz2
LD64NAME=ld64
-LD64VERS=47.2
+LD64VERS=59.2
LD64DISTFILE=${LD64NAME}-${LD64VERS}.tar.bz2
DISTDIR=odcctools
Modified: trunk/files/configure.ac
===================================================================
--- trunk/files/configure.ac 2006-09-12 03:36:05 UTC (rev 141)
+++ trunk/files/configure.ac 2006-09-12 03:59:36 UTC (rev 142)
@@ -1,4 +1,4 @@
-AC_INIT([odcctools], [590.42.1od14], [odcctools at opendarwin.org])
+AC_INIT([odcctools], [622.3od15], [odcctools at opendarwin.org])
AC_PREREQ([2.57])
AC_REVISION([$Revision: 1.45 $])
@@ -25,7 +25,7 @@
AC_DEFINE(EMULATED_HOST_CPU_TYPE, 18, [Emulated CPU type])
AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 100, [Emulated CPU subtype])
;;
- i?86)
+ i?86|x86_64)
AC_DEFINE(EMULATED_HOST_CPU_TYPE, 7, [Emulated CPU type])
AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 10, [Emulated CPU subtype])
;;
@@ -48,16 +48,16 @@
AC_MSG_CHECKING([for configured assembler targets])
AC_ARG_ENABLE([as-targets],
AC_HELP_STRING([--enable-as-targets],
- [space-separated list ("ppc", "ppc64", "i386", "all")]),
+ [space-separated list ("ppc", "ppc64", "i386", "x86_64", "all")]),
[conftargets="$enableval"],
[conftargets="default"])
case "$conftargets" in
all)
- ASTARGETS="ppc ppc64 i386"
+ ASTARGETS="ppc ppc64 i386 x86_64"
;;
default)
- ASTARGETS="ppc ppc64 i386"
+ ASTARGETS="ppc ppc64 i386 x86_64"
;;
yes)
AC_MSG_ERROR([no assembler targets configured])
@@ -283,6 +283,9 @@
i386)
AC_CONFIG_FILES([as/i386/Makefile:as/i386/Makefile.in:as/Makefile.arch.in])
;;
+ x86_64)
+ AC_CONFIG_FILES([as/x86_64/Makefile:as/x86_64/Makefile.in:as/Makefile.arch.in])
+ ;;
*)
AC_MSG_ERROR([Unrecognized assembler target $ast])
;;
Modified: trunk/patches/ld/relocate-ld64.diff
===================================================================
--- trunk/patches/ld/relocate-ld64.diff 2006-09-12 03:36:05 UTC (rev 141)
+++ trunk/patches/ld/relocate-ld64.diff 2006-09-12 03:59:36 UTC (rev 142)
@@ -1,11 +1,20 @@
---- ./ld.c.orig 2006-03-15 20:35:30.000000000 -0800
-+++ ./ld.c 2006-03-15 20:35:31.000000000 -0800
-@@ -555,7 +555,7 @@
- strcmp(argv[i], "-arch") == 0 &&
- i + 1 < argc &&
- strcmp(argv[i+1], "ppc64") == 0){
-- argv[0] = "/usr/bin/ld64";
-+ argv[0] = BINDIR "/" LD64PROG;
- ld_exit(!execute(argv, 0));
+--- ./ld.c.orig 2006-09-11 20:51:23.000000000 -0700
++++ ./ld.c 2006-09-11 20:51:33.000000000 -0700
+@@ -2024,7 +2024,7 @@
+ * 64-bit architectures are handled by ld64
+ */
+ if(arch_flag.cputype & CPU_ARCH_ABI64) {
+- argv[0] = "/usr/bin/ld64";
++ argv[0] = BINDIR "/" LD64PROG;
+ ld_exit(!execute(argv, 0));
}
+
+@@ -2913,7 +2913,7 @@
+ */
+ if(arch_flag.cputype != 0 &&
+ arch_flag.cputype & CPU_ARCH_ABI64){
+- argv[0] = "/usr/bin/ld64";
++ argv[0] = BINDIR "/" LD64PROG;
+ ld_exit(!execute(argv, 0));
}
+
Modified: trunk/patches/ld64/MachOReaderRelocatable-ctz.diff
===================================================================
--- trunk/patches/ld64/MachOReaderRelocatable-ctz.diff 2006-09-12 03:36:05 UTC (rev 141)
+++ trunk/patches/ld64/MachOReaderRelocatable-ctz.diff 2006-09-12 03:59:36 UTC (rev 142)
@@ -1,6 +1,6 @@
---- src/MachOReaderRelocatable.hpp.orig 2006-06-08 20:44:51.000000000 -0700
-+++ src/MachOReaderRelocatable.hpp 2006-06-08 20:50:35.000000000 -0700
-@@ -357,6 +357,16 @@
+--- ./src/MachOReaderRelocatable.hpp.orig 2006-09-11 20:51:41.000000000 -0700
++++ ./src/MachOReaderRelocatable.hpp 2006-09-11 20:51:50.000000000 -0700
+@@ -383,6 +383,16 @@
}
}
@@ -17,19 +17,24 @@
template <typename A>
void SymbolAtom<A>::setSize(uint64_t size)
-@@ -364,13 +374,13 @@
- fSize = size;
-
- // Try to compute the alignment base on the address aligned at in object file and the size
-- uint8_t sizeAlign = __builtin_ctz(fSize);
-+ uint8_t sizeAlign = ctz(fSize);
- uint8_t sizeAndSectAlign = std::min((uint8_t)fSection->align(), sizeAlign);
- // If address is zero, can't figure out better alignment than section alignment and size
- if ( fAddress == 0 )
- fAlignment = sizeAndSectAlign;
- else
-- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), sizeAndSectAlign);
-+ fAlignment = std::min((uint8_t)ctz(fAddress), sizeAndSectAlign);
+@@ -394,17 +404,17 @@
+ if ( fAddress == 0 )
+ fAlignment = fSection->align();
+ else
+- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), (uint8_t)fSection->align());
++ fAlignment = std::min((uint8_t)ctz(fAddress), (uint8_t)fSection->align());
+ }
+ else {
+ // For data, compute the alignment base on the address aligned at in object file and the size
+- uint8_t sizeAlign = __builtin_ctz(fSize);
++ uint8_t sizeAlign = ctz(fSize);
+ uint8_t sizeAndSectAlign = std::min((uint8_t)fSection->align(), sizeAlign);
+ // If address is zero, can't figure out better alignment than section alignment and size
+ if ( fAddress == 0 )
+ fAlignment = sizeAndSectAlign;
+ else
+- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), sizeAndSectAlign);
++ fAlignment = std::min((uint8_t)ctz(fAddress), sizeAndSectAlign);
+ }
}
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060911/dd6ff9c7/attachment-0001.html
More information about the Odcctools-changes
mailing list