hasting2 03/01/14 15:33:42
Modified: live/gcc3 Tag: fearless-kitty-branch build_gcc
live/gcc3/gcc Tag: fearless-kitty-branch configure
configure.in version.c
Added: live/gcc3 Tag: fearless-kitty-branch config.apple
Log:
Add $CONFIG_SITE file named "config.apple" and use to detect/support
".weak_definition" pseudo.
Bug #: 3139147
Submitted by: stuart
Revision Changes Path
No revision
No revision
1.56.2.2 +3 -0 src/live/gcc3/build_gcc
Index: build_gcc
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/build_gcc,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -r1.56.2.1 -r1.56.2.2
--- build_gcc 2002/12/11 20:47:36 1.56.2.1
+++ build_gcc 2003/01/14 23:33:36 1.56.2.2
@@ -517,6 +517,7 @@
#
configure_gcc()
{
+ export CONFIG_SITE=$SRCROOT/config.apple
for target in $TARGETS; do
for host in $HOSTS; do
$n mkdir -p $OBJROOT/cc-$target-on-$host
@@ -548,6 +549,7 @@
"Default cc = `\cc -v 2>&1 | fgrep 'gcc version' | \
sed -e 's/.*version \([^
,]*\),.*version \([^ ]*\).*/version \2, \1/'`" \
"Curr. hdrs = `\ls -l
/usr/include/gcc/darwin/default | sed -e 's,.*-> \(.*\),\1,'`" \
+ "CONFIG_SITE = $CONFIG_SITE" \
"ENABLE_CHECKING = ${ENABLE_CHECKING:---enable-checking}"
$n rm -f make.id
$n echo $SRCROOT/gcc:$arch > make.id
@@ -576,6 +578,7 @@
fi
done
done
+ unset CONFIG_SITE
}
#---------------------------------------------------------------------------#
No revision
No revision
1.1.2.1 +53 -0 src/live/gcc3/Attic/config.apple
No revision
No revision
1.59.2.1 +10 -34 src/live/gcc3/gcc/configure
Index: configure
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/configure,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -r1.59 -r1.59.2.1
--- configure 2002/06/29 01:57:39 1.59
+++ configure 2003/01/14 23:33:37 1.59.2.1
@@ -5101,8 +5101,8 @@
# as well. If host!=build, we are in error and need to do more
# work to find out the build config parameters.
# APPLE LOCAL begin fat builds ilr
-host_darwin="`echo $host | sed -e 's/.*-darwin$/darwin/'`"
-build_darwin="`echo $build | sed -e 's/.*-darwin$/darwin/'`"
+host_darwin=`echo $host | sed -e 's/.*-darwin[0-9.]*$/darwin/'`
+build_darwin=`echo $build | sed -e 's/.*-darwin[0-9.]*$/darwin/'`
if test x$host = x$build -o "$host_darwin" = "$build_darwin" -a "$host_darwin" =
"darwin"
# APPLE LOCAL end fat builds ilr
then
@@ -7771,32 +7771,8 @@
echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking whether assembler supports weak assembler directive.""...
$ac_c" 1>&6
-echo "configure:7776: checking whether assembler supports weak assembler
directive." >&5
-apple_gcc_as_weak_assembler_directive=no
-cat > conftest.s <<EOF
-.section __TEXT,text,coalesced
- .align 2
- .weak_definition foo
- .globl foo
-foo:
-EOF
-if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 ; then
- apple_gcc_as_weak_assembler_directive="yes"
-fi
-rm -f conftest.s conftest.o
-if test x"$apple_gcc_as_weak_assembler_directive" = xyes; then
- cat >> confdefs.h <<\EOF
-#define APPLE_WEAK_ASSEMBLER_DIRECTIVE 1
-EOF
-
-echo "$ac_t""yes" 1>&6
-else
-echo "$ac_t""no" 1>&6
-fi
-
echo $ac_n "checking whether assembler supports strip static syms assembler
directive.""... $ac_c" 1>&6
-echo "configure:7800: checking whether assembler supports strip static syms
assembler directive." >&5
+echo "configure:7776: checking whether assembler supports strip static syms
assembler directive." >&5
apple_gcc_as_strip_static_syms_assembler_directive=no
cat > conftest.s <<EOF
.section __TEXT,text,coalesced,no_toc+strip_static_syms
@@ -7821,7 +7797,7 @@
# APPLE LOCAL end coalescing --matt
echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6
-echo "configure:7825: checking assembler --gstabs support" >&5
+echo "configure:7801: checking assembler --gstabs support" >&5
gcc_cv_as_gstabs_flag=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x;
then
@@ -7849,7 +7825,7 @@
echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6
echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
-echo "configure:7853: checking linker PT_GNU_EH_FRAME support" >&5
+echo "configure:7829: checking linker PT_GNU_EH_FRAME support" >&5
gcc_cv_ld_eh_frame_hdr=no
if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12
-o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null;
then
@@ -8012,7 +7988,7 @@
echo $ac_n "checking whether to enable maintainer-specific portions of
Makefiles""... $ac_c" 1>&6
-echo "configure:8016: checking whether to enable maintainer-specific portions of
Makefiles" >&5
+echo "configure:7992: checking whether to enable maintainer-specific portions of
Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -8053,7 +8029,7 @@
fi
echo $ac_n "checking whether debugging functions for tree and rtl nodes
requested""... $ac_c" 1>&6
-echo "configure:8057: checking whether debugging functions for tree and rtl nodes
requested" >&5
+echo "configure:8033: checking whether debugging functions for tree and rtl nodes
requested" >&5
if test x${enable_idebug} = xyes; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -8076,7 +8052,7 @@
fi
echo $ac_n "checking whether dmp_tree() support for debugger was requested""...
$ac_c" 1>&6
-echo "configure:8080: checking whether dmp_tree() support for debugger was
requested" >&5
+echo "configure:8056: checking whether dmp_tree() support for debugger was
requested" >&5
if test x${enable_dmp_tree} = xyes; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -8099,7 +8075,7 @@
fi
echo $ac_n "checking whether PFE support is requested""... $ac_c" 1>&6
-echo "configure:8103: checking whether PFE support is requested" >&5
+echo "configure:8079: checking whether PFE support is requested" >&5
if test x${enable_pfe} = xyes; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -8128,7 +8104,7 @@
fi
echo $ac_n "checking whether configuring from build_gcc""... $ac_c" 1>&6
-echo "configure:8132: checking whether configuring from build_gcc" >&5
+echo "configure:8108: checking whether configuring from build_gcc" >&5
if test x${enable_build_gcc} = xyes; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
1.49.2.1 +4 -24 src/live/gcc3/gcc/configure.in
Index: configure.in
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/configure.in,v
retrieving revision 1.49
retrieving revision 1.49.2.1
diff -u -r1.49 -r1.49.2.1
--- configure.in 2002/06/26 23:08:50 1.49
+++ configure.in 2003/01/14 23:33:39 1.49.2.1
@@ -846,8 +846,10 @@
# as well. If host!=build, we are in error and need to do more
# work to find out the build config parameters.
# APPLE LOCAL begin fat builds ilr
-host_darwin="`echo $host | sed -e 's/.*-darwin$/darwin/'`"
-build_darwin="`echo $build | sed -e 's/.*-darwin$/darwin/'`"
+changequote(,)dnl
+host_darwin=`echo $host | sed -e 's/.*-darwin[0-9.]*$/darwin/'`
+build_darwin=`echo $build | sed -e 's/.*-darwin[0-9.]*$/darwin/'`
+changequote([,])dnl
if test x$host = x$build -o "$host_darwin" = "$build_darwin" -a "$host_darwin" =
"darwin"
# APPLE LOCAL end fat builds ilr
then
@@ -1979,28 +1981,6 @@
AC_DEFINE(APPLE_WEAK_SECTION_ATTRIBUTE, 1,
[APPLE LOCAL coalescing
Define if your assembler supports weak section attribute.])
-AC_MSG_RESULT(yes)
-else
-AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING([whether assembler supports weak assembler directive.])
-apple_gcc_as_weak_assembler_directive=no
-cat > conftest.s <<EOF
-.section __TEXT,text,coalesced
- .align 2
- .weak_definition foo
- .globl foo
-foo:
-EOF
-if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 ; then
- apple_gcc_as_weak_assembler_directive="yes"
-fi
-rm -f conftest.s conftest.o
-if test x"$apple_gcc_as_weak_assembler_directive" = xyes; then
- AC_DEFINE(APPLE_WEAK_ASSEMBLER_DIRECTIVE, 1,
-[APPLE LOCAL coalescing
-Define if your assembler supports weak assembler directives.])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
1.44.2.26 +1 -1 src/live/gcc3/gcc/version.c
Index: version.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/version.c,v
retrieving revision 1.44.2.25
retrieving revision 1.44.2.26
diff -u -r1.44.2.25 -r1.44.2.26
--- version.c 2002/12/20 01:17:17 1.44.2.25
+++ version.c 2003/01/14 23:33:39 1.44.2.26
@@ -6,5 +6,5 @@
/* APPLE LOCAL begin Apple version */
/* Note that we can't say "apple_v*rs**n_str*ng" because of a cheesy
grep in configure that will get very confused if we do. */
-const char *const apple_version_str = "1209";
+const char *const apple_version_str = "1250";
/* APPLE LOCAL end Apple version */
