Skip to content

Commit 88e40d3

Browse files
gcc-5575.11
Imported from gcc-5575.11.tar.gz
1 parent da613bb commit 88e40d3

15 files changed

+371
-69
lines changed

ChangeLog.apple

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2009-05-27 Bob Wilson <[email protected]>
2+
3+
Radar 6915254
4+
* build_gcc: When the Legacy PDK (or whatever B&I uses) is not
5+
available, fall back to use the internal iPhone SDK with the tools
6+
from the iPhone platform directory.
7+
18
2009-02-25 Jim Grosbach <[email protected]>
29

310
Radar 6611402

build_gcc

Lines changed: 73 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,6 @@ fi
7474
# to be built. It's VERS but only up to the second '.' (if there is one).
7575
MAJ_VERS=`echo $VERS | sed 's/\([0-9]*\.[0-9]*\)[.-].*/\1/'`
7676

77-
# APPLE LOCAL begin ARM ARM_CONFIGFLAGS
78-
# For ARM, grab all system files from an SDK.
79-
ARM_SYSROOT="/Developer/SDKs/Extra"
80-
ARM_LIBSTDCXX_VERSION=4.2.1
81-
ARM_CONFIGFLAGS="--with-sysroot=\"$ARM_SYSROOT\" \
82-
--with-gxx-include-dir=\${prefix}/include/c++/$ARM_LIBSTDCXX_VERSION"
83-
# APPLE LOCAL end ARM ARM_CONFIGFLAGS
84-
8577
# This is the libstdc++ version to use.
8678
LIBSTDCXX_VERSION=4.2.1
8779
if [ ! -d "$DEST_ROOT/include/c++/$LIBSTDCXX_VERSION" ]; then
@@ -92,6 +84,60 @@ NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VE
9284
DARWIN_VERS=`uname -r | sed 's/\..*//'`
9385
echo DARWIN_VERS = $DARWIN_VERS
9486

87+
# APPLE LOCAL begin ARM
88+
ARM_LIBSTDCXX_VERSION=4.2.1
89+
ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$ARM_LIBSTDCXX_VERSION"
90+
91+
ARM_PLATFORM=/Developer/Platforms/iPhoneOS.platform
92+
ARM_IPHONE_SDK=iPhoneOS${IPHONEOS_DEPLOYMENT_TARGET}.Internal.sdk
93+
ARM_EXTRA_SDK=/Developer/SDKs/Extra
94+
95+
# Check if the build system is running Leopard or earlier. If the Legacy PDK
96+
# is not installed, the toolchain in / will not support ARM. Use the iPhone
97+
# platform directory instead.
98+
# ALQAAHIRA LOCAL do not use default tools without the Legacy PDK
99+
if [ $DARWIN_VERS -le 999 -a ! -d $ARM_EXTRA_SDK ]; then
100+
ARM_TOOLROOT=$ARM_PLATFORM
101+
else
102+
ARM_TOOLROOT=/
103+
fi
104+
105+
# ARM may require a sysroot option.
106+
ARM_SYSROOT=$ARM_EXTRA_SDK
107+
# If the default sysroot does not exist, try a different location.
108+
if [ ! -d $ARM_SYSROOT ]; then
109+
ARM_SYSROOT=$ARM_PLATFORM/Developer/SDKs/$ARM_IPHONE_SDK
110+
fi
111+
112+
# ALQAAHIRA LOCAL use --with-sysroot regardless of the MacOS version
113+
# # Split the MACOSX_DEPLOYMENT_TARGET into major/minor versions.
114+
# if [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
115+
# # Anything 10.5 or earlier is treated the same below.
116+
# MACOSX_DEPLOYMENT_MAJOR=10
117+
# MACOSX_DEPLOYMENT_MINOR=5
118+
# else
119+
# MACOSX_DEPLOYMENT_MAJOR=`echo $MACOSX_DEPLOYMENT_TARGET | sed 's/\..*//'`
120+
# MACOSX_DEPLOYMENT_MINOR=`echo $MACOSX_DEPLOYMENT_TARGET | sed 's/[0-9]*\.\([0-9]*\).*/\1/'`
121+
# fi
122+
if true; then
123+
ARM_CONFIGFLAGS="$ARM_CONFIGFLAGS --with-sysroot=\"$ARM_SYSROOT\""
124+
else
125+
ARM_SYSROOT=/
126+
fi
127+
128+
# If building an ARM target, check that the required directories exist.
129+
if echo $TARGETS | grep arm; then
130+
if [ ! -d $ARM_SYSROOT ]; then
131+
echo "Error: cannot find ARM SDK to build ARM target"
132+
exit 1
133+
fi
134+
if [ ! -d $ARM_TOOLROOT ]; then
135+
echo "Error: $ARM_TOOLROOT directory is not installed"
136+
exit 1
137+
fi
138+
fi
139+
# APPLE LOCAL end ARM
140+
95141
# If the user has CC set in their environment unset it now
96142
unset CC
97143

@@ -171,18 +217,34 @@ mkdir $DIR/bin || exit 1
171217
for prog in ar nm ranlib strip lipo ld ; do
172218
for t in `echo $TARGETS $HOSTS | sort -u`; do
173219
P=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-${prog}
220+
# APPLE LOCAL begin toolroot
221+
if [ $t = "arm" ]; then
222+
toolroot=$ARM_TOOLROOT
223+
else
224+
toolroot=
225+
fi
226+
# APPLE LOCAL end toolroot
174227
echo '#!/bin/sh' > $P || exit 1
175-
echo 'exec /usr/bin/'${prog}' "$@"' >> $P || exit 1
228+
# APPLE LOCAL insert toolroot below
229+
echo 'exec '${toolroot}'/usr/bin/'${prog}' "$@"' >> $P || exit 1
176230
chmod a+x $P || exit 1
177231
done
178232
done
179233
for t in `echo $1 $2 | sort -u`; do
180234
gt=`echo $t | $TRANSLATE_ARCH`
181235
P=$DIR/bin/${gt}-apple-darwin$DARWIN_VERS-as
236+
# APPLE LOCAL begin toolroot
237+
if [ $gt = "arm" ]; then
238+
toolroot=$ARM_TOOLROOT
239+
else
240+
toolroot=
241+
fi
242+
# APPLE LOCAL end toolroot
182243
echo '#!/bin/sh' > $P || exit 1
183244

184-
echo 'for a; do case $a in -arch) exec /usr/bin/as "$@";; esac; done' >> $P || exit 1
185-
echo 'exec /usr/bin/as -arch '${t}' "$@"' >> $P || exit 1
245+
# APPLE LOCAL insert toolroot below
246+
echo 'for a; do case $a in -arch) exec '${toolroot}'/usr/bin/as "$@";; esac; done' >> $P || exit 1
247+
echo 'exec '${toolroot}'/usr/bin/as -arch '${t}' "$@"' >> $P || exit 1
186248
chmod a+x $P || exit 1
187249
done
188250
PATH=$DIR/bin:$PATH

gcc/ChangeLog.apple

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
1+
2009-07-03 Jon Ziegler <[email protected]>
2+
3+
Back out Bob's patch for 6879229 since it causes problems for the
4+
Northstar build.
5+
6+
2009-06-25 Bob Wilson <[email protected]>
7+
8+
Radar 6879229
9+
* config/arm/arm.c (arm_override_options): Disallow -fasm-blocks.
10+
* doc/invoke.texi (-fasm-blocks): Document this restriction.
11+
12+
2009-06-17 Jim Grosbach <[email protected]>
13+
14+
Radar 6821124
15+
* builtin-attrs.def (DEF_FORMAT_ATTRIBUTE): For Darwin, don't claim
16+
the format argument to be nonnull.
17+
* builtins.def (BUILT_IN_FPUTS, BUILT_IN_FPUTS_UNLOCKED,
18+
BUILT_IN_PUTS, BUILT_IN_PUTS_UNLOCKED): Likewise.
19+
20+
2009-06-17 Jim Grosbach <[email protected]>
21+
22+
Radar 6858124
23+
* config/arm/arm.c (arm_output_mi_thunk): Stub calls aren't indirect
24+
in MI thumb thunks.
25+
26+
2009-06-15 Fariborz Jahanian <[email protected]>
27+
28+
Radar 6936421
29+
* cvt.c (force_rvalue): Convert property reference
30+
expression to its getter call before converting to
31+
rvalue.
32+
* obj-c++.dg/property-as-initializer.mm: New
33+
34+
2009-06-12 Jim Grosbach <[email protected]>
35+
36+
Radar 6868127
37+
* doc/invoke.texi (-mthumb): Specify that thumb is the default for
38+
armv7.
39+
40+
2009-05-20 Jim Grosbach <[email protected]>
41+
42+
Radar 6902937
43+
* config/arm/arm.c (arm_output_epilogue_vfp_restore): New function.
44+
(arm_output_epilogue): Factor out common code to
45+
arm_output_epilogue_vfp_restore.
46+
47+
2009-05-19 Jim Grosbach <[email protected]>
48+
49+
Radar 6902792
50+
* config/arm/arm.c: Add includes for stdlib.h and ctype.h.
51+
(TARGET_MD_ASM_CLOBBERS): New.
52+
(arm_md_asm_clobbers): New function. Add a clobber of the upper
53+
half D register when a Q register clobber is used.
54+
55+
2009-04-08 Jim Grosbach <[email protected]>
56+
57+
Radar 6738583
58+
* config/arm/arm.c (arm_init_cumulative_args): Always short call local
59+
functions.
60+
161
2009-03-18 Jim Grosbach <[email protected]
262

363
Radar 6676111 (from Mike's fix to SnowLeopard gcc 4.2 6486153)

gcc/builtin-attrs.def

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,21 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_NONNULL, ATTR_MALLOC, ATTR_NULL, \
150150
ATTR_NOTHROW_NONNULL)
151151

152152
/* Construct a tree for a format attribute. */
153+
/* APPLE LOCAL begin 6821124 darwin libc allows null args */
154+
#ifdef CONFIG_DARWIN_H
155+
#define DEF_FORMAT_ATTRIBUTE(TYPE, FA, VALUES) \
156+
DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \
157+
ATTR_##TYPE, ATTR_LIST_##VALUES) \
158+
DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT, \
159+
ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_LIST)
160+
#else
153161
#define DEF_FORMAT_ATTRIBUTE(TYPE, FA, VALUES) \
154162
DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \
155163
ATTR_##TYPE, ATTR_LIST_##VALUES) \
156164
DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT, \
157165
ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
166+
#endif
167+
/* APPLE LOCAL end 6821124 darwin libc allows null args */
158168
DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0)
159169
DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2)
160170
DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0)

gcc/builtins.def

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,17 +531,31 @@ DEF_LIB_BUILTIN (BUILT_IN_PUTC, "putc", BT_FN_INT_INT_FILEPTR, ATTR_NONNU
531531
DEF_EXT_LIB_BUILTIN (BUILT_IN_PUTC_UNLOCKED, "putc_unlocked", BT_FN_INT_INT_FILEPTR, ATTR_NONNULL_LIST)
532532
DEF_LIB_BUILTIN (BUILT_IN_FPUTC, "fputc", BT_FN_INT_INT_FILEPTR, ATTR_NONNULL_LIST)
533533
DEF_EXT_LIB_BUILTIN (BUILT_IN_FPUTC_UNLOCKED, "fputc_unlocked", BT_FN_INT_INT_FILEPTR, ATTR_NONNULL_LIST)
534+
/* APPLE LOCAL begin 6821124 darwin libc allows null args */
535+
#ifdef CONFIG_DARWIN_H
536+
DEF_LIB_BUILTIN (BUILT_IN_FPUTS, "fputs", BT_FN_INT_CONST_STRING_FILEPTR, ATTR_NULL)
537+
DEF_EXT_LIB_BUILTIN (BUILT_IN_FPUTS_UNLOCKED, "fputs_unlocked", BT_FN_INT_CONST_STRING_FILEPTR, ATTR_NULL)
538+
#else
534539
DEF_LIB_BUILTIN (BUILT_IN_FPUTS, "fputs", BT_FN_INT_CONST_STRING_FILEPTR, ATTR_NONNULL_LIST)
535540
DEF_EXT_LIB_BUILTIN (BUILT_IN_FPUTS_UNLOCKED, "fputs_unlocked", BT_FN_INT_CONST_STRING_FILEPTR, ATTR_NONNULL_LIST)
541+
#endif
542+
/* APPLE LOCAL end 6821124 darwin libc allows null args */
536543
DEF_LIB_BUILTIN (BUILT_IN_FSCANF, "fscanf", BT_FN_INT_FILEPTR_CONST_STRING_VAR, ATTR_FORMAT_SCANF_2_3)
537544
DEF_LIB_BUILTIN (BUILT_IN_FWRITE, "fwrite", BT_FN_SIZE_CONST_PTR_SIZE_SIZE_FILEPTR, ATTR_NONNULL_LIST)
538545
DEF_EXT_LIB_BUILTIN (BUILT_IN_FWRITE_UNLOCKED, "fwrite_unlocked", BT_FN_SIZE_CONST_PTR_SIZE_SIZE_FILEPTR, ATTR_NONNULL_LIST)
539546
DEF_LIB_BUILTIN (BUILT_IN_PRINTF, "printf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_1_2)
540547
DEF_EXT_LIB_BUILTIN (BUILT_IN_PRINTF_UNLOCKED, "printf_unlocked", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_1_2)
541548
DEF_LIB_BUILTIN (BUILT_IN_PUTCHAR, "putchar", BT_FN_INT_INT, ATTR_NULL)
542549
DEF_EXT_LIB_BUILTIN (BUILT_IN_PUTCHAR_UNLOCKED, "putchar_unlocked", BT_FN_INT_INT, ATTR_NULL)
550+
/* APPLE LOCAL begin 6821124 darwin libc allows null args */
551+
#ifdef CONFIG_DARWIN_H
552+
DEF_LIB_BUILTIN (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NULL)
553+
DEF_EXT_LIB_BUILTIN (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NULL)
554+
#else
543555
DEF_LIB_BUILTIN (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
544556
DEF_EXT_LIB_BUILTIN (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
557+
#endif
558+
/* APPLE LOCAL end 6821124 darwin libc allows null args */
545559
DEF_LIB_BUILTIN (BUILT_IN_SCANF, "scanf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_SCANF_1_2)
546560
DEF_C99_BUILTIN (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
547561
DEF_LIB_BUILTIN (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)

0 commit comments

Comments
 (0)