Permalink
Browse files

whoops

  • Loading branch information...
1 parent 3ed303f commit a212f236eef15fe02a35050235a5683b8a50c474 @comex committed Dec 9, 2011
Showing with 8 additions and 8 deletions.
  1. +1 −1 Makefile.common
  2. +4 −4 binary.h
  3. +1 −1 ios-classify.h
  4. +2 −2 mach-o/binary.h
View
@@ -14,7 +14,7 @@ ifneq "$(NDEBUG)" "1"
override CFLAGS += -g3
endif
-SDK_GCC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/ -miphoneos-version-min=4.0 -mapcs-frame -fomit-frame-pointer -mthumb
+SDK_GCC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/clang -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/ -miphoneos-version-min=4.0 -mapcs-frame -fomit-frame-pointer -mthumb
GCC_native = gcc
GCC_mp = gcc-mp-4.6
View
@@ -62,10 +62,10 @@ static inline bool prange_check(const struct binary *binary, prange_t range) {
return binary->valid_range.start <= range.start && range.size <= (size_t) ((char *) binary->valid_range.start + binary->valid_range.size - (char *) range.start);
}
-__attribute__((const)) prange_t rangeconv(range_t range, int flags);
-__attribute__((const)) prange_t rangeconv_off(range_t range, int flags);
-__attribute__((const)) range_t range_to_off_range(range_t range, int flags);
-__attribute__((const)) range_t off_range_to_range(range_t range, int flags);
+__attribute__((pure)) prange_t rangeconv(range_t range, int flags);
+__attribute__((pure)) prange_t rangeconv_off(range_t range, int flags);
+__attribute__((pure)) range_t range_to_off_range(range_t range, int flags);
+__attribute__((pure)) range_t off_range_to_range(range_t range, int flags);
void b_init(struct binary *binary);
View
@@ -14,7 +14,7 @@ static unsigned int _50 = 3;
(die("no valid alternative"), (typeof(v1+0)) 0))
#define spec(args...) spec_(args, 10, 0, 10, 0, 10, 0)
-#define is_armv7(binary) (binary->actual_cpusubtype == 9)
+#define is_armv7(binary) (binary->cpusubtype == 9)
static unsigned int classify(const struct binary *binary) {
if(!is_armv7(binary)) return _armv6;
View
@@ -34,8 +34,8 @@ static inline struct mach_header *b_mach_hdr(const struct binary *binary) {
return binary->valid_range.start + binary->header_offset;
}
-__attribute__((const)) range_t b_macho_segrange(const struct binary *binary, const char *segname);
-__attribute__((const)) range_t b_macho_sectrange(const struct binary *binary, const char *segname, const char *sectname);
+__attribute__((pure)) range_t b_macho_segrange(const struct binary *binary, const char *segname);
+__attribute__((pure)) range_t b_macho_sectrange(const struct binary *binary, const char *segname, const char *sectname);
void b_prange_load_macho(struct binary *binary, prange_t range, size_t offset, const char *name);
void b_prange_load_macho_nosyms(struct binary *binary, prange_t range, size_t offset, const char *name);

0 comments on commit a212f23

Please sign in to comment.