tech-toolchain archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: GCC 4.5 update -- status



mrg%eterna.com.au@localhost said:
> - consider the dl_iterate_phdr change drochner suggested

Here is a patch against -current which works well on i386.
(The patch for config.gcc does only consider i386, should be
easy to extend -- the important thing is to get
-fno-asynchronous-unwind-tables into effect, otherwise
some .eh_frame section gets invalid in crtend.)
I've added the diffs to generated files. There are two
unwanted differences:
-GNUHOSTDIST isn't always substituted.
-The <tgmath.h> header is picked up although it is
 not installed.
The former can hopefully be fixed in the mknative script.
tgmath.h should just be installed Imho.

There is one possible inconsistency: For x86, the
USE_COMPILERCRTSTUFF make variable is set to "no" in bsd.own.mk.
This makes that a crtbegin/end is built and installed from
src/lib/csu/arch which does not exactly fit the compiler.
In particular it still calls register_frame_info(). I haven't
seen any actual datage due to it though - it seems to be
just overhead.

best regards
Matthias


------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich
Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzender des Aufsichtsrats: MinDirig Dr. Karl Eugen Huthmacher
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
Prof. Dr. Sebastian M. Schmidt
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------

Besuchen Sie uns auf unserem neuen Webauftritt unter www.fz-juelich.de
# HG changeset patch
# Parent 734343ce70d46525c84ac14733cde2c8dd5372b8

diff -r 734343ce70d4 external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Tue Jul 05 12:05:12 2011 +0200
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Tue Jul 05 17:58:34 2011 +0200
@@ -1133,6 +1133,7 @@
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h 
netbsd-elf.h i386/netbsd-elf.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h 
netbsd.h netbsd-aout.h i386/netbsd.h"
diff -r 734343ce70d4 external/gpl3/gcc/dist/gcc/config/t-netbsd
--- a/external/gpl3/gcc/dist/gcc/config/t-netbsd        Tue Jul 05 12:05:12 
2011 +0200
+++ b/external/gpl3/gcc/dist/gcc/config/t-netbsd        Tue Jul 05 17:58:34 
2011 +0200
@@ -1,2 +1,7 @@
 # Always build crtstuff with PIC.
 CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+
+# Use unwind-dw2-fde-glibc
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
+  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
diff -r 734343ce70d4 external/gpl3/gcc/dist/gcc/crtstuff.c
--- a/external/gpl3/gcc/dist/gcc/crtstuff.c     Tue Jul 05 12:05:12 2011 +0200
+++ b/external/gpl3/gcc/dist/gcc/crtstuff.c     Tue Jul 05 17:58:34 2011 +0200
@@ -92,6 +92,15 @@
     && !defined(OBJECT_FORMAT_FLAT) \
     && defined(HAVE_LD_EH_FRAME_HDR) \
     && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
+    && defined(__NetBSD__)
+#include <link.h>
+# define USE_PT_GNU_EH_FRAME
+#endif
+
+#if defined(OBJECT_FORMAT_ELF) \
+    && !defined(OBJECT_FORMAT_FLAT) \
+    && defined(HAVE_LD_EH_FRAME_HDR) \
+    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
     && defined(__GLIBC__) && __GLIBC__ >= 2
 #include <link.h>
 /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
diff -r 734343ce70d4 external/gpl3/gcc/dist/gcc/unwind-dw2-fde-glibc.c
--- a/external/gpl3/gcc/dist/gcc/unwind-dw2-fde-glibc.c Tue Jul 05 12:05:12 
2011 +0200
+++ b/external/gpl3/gcc/dist/gcc/unwind-dw2-fde-glibc.c Tue Jul 05 17:58:34 
2011 +0200
@@ -57,6 +57,12 @@
 # define USE_PT_GNU_EH_FRAME
 #endif
 
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+    && defined(__NetBSD__)
+# define ElfW(n) Elf_##n
+# define USE_PT_GNU_EH_FRAME
+#endif
+
 #if defined(USE_PT_GNU_EH_FRAME)
 
 #ifndef __RELOC_POINTER
diff -r 734343ce70d4 external/gpl3/gcc/lib/crtstuff/arch/i386.mk
--- a/external/gpl3/gcc/lib/crtstuff/arch/i386.mk       Tue Jul 05 12:05:12 
2011 +0200
+++ b/external/gpl3/gcc/lib/crtstuff/arch/i386.mk       Tue Jul 05 17:58:34 
2011 +0200
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. 
-I${GNUHOSTDIST}/gcc/../include -I./../intl 
-I${GNUHOSTDIST}/gcc/../libcpp/include     -I${GNUHOSTDIST}/gcc/../libdecnumber 
-I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber   
-I/usr/include/libelf
 G_CRTSTUFF_CFLAGS=-O2  -DIN_GCC   -W -Wall -Wwrite-strings -Wcast-qual 
-Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition  -isystem 
./include  -I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. 
-I${GNUHOSTDIST}/gcc/../include -I./../intl 
-I${GNUHOSTDIST}/gcc/../libcpp/include     -I${GNUHOSTDIST}/gcc/../libdecnumber 
-I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber   
-I/usr/include/libelf  -g0 -finhibit-size-directive -fno-inline -fno-exceptions 
-fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize 
-G_CRTSTUFF_T_CFLAGS=
+G_CRTSTUFF_T_CFLAGS= -fno-omit-frame-pointer -fno-asynchronous-unwind-tables
 G_tm_defines=NETBSD_ENABLE_PTHREADS
 G_xm_file=
 G_xm_defines=
diff -r 734343ce70d4 external/gpl3/gcc/lib/libgcc/arch/i386.mk
--- a/external/gpl3/gcc/lib/libgcc/arch/i386.mk Tue Jul 05 12:05:12 2011 +0200
+++ b/external/gpl3/gcc/lib/libgcc/arch/i386.mk Tue Jul 05 17:58:34 2011 +0200
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. 
-I${GNUHOSTDIST}/gcc/../include -I./../intl 
-I${GNUHOSTDIST}/gcc/../libcpp/include     -I${GNUHOSTDIST}/gcc/../libdecnumber 
-I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber   
-I/usr/include/libelf
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c 
${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c 
${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c 
${GNUHOSTDIST}/gcc/unwind-dw2-fde-glibc.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c 
${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB2ADD_ST=
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
diff -r 734343ce70d4 external/gpl3/gcc/lib/libobjc/arch/i386/defs.mk
--- a/external/gpl3/gcc/lib/libobjc/arch/i386/defs.mk   Tue Jul 05 12:05:12 
2011 +0200
+++ b/external/gpl3/gcc/lib/libobjc/arch/i386/defs.mk   Tue Jul 05 17:58:34 
2011 +0200
@@ -1,10 +1,10 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from:      NetBSD: mknative-gcc,v 1.53 2011/06/29 05:06:03 mrg Exp 
+# Generated from:      NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c.opt 
${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/i386/i386.opt
-G_ALL_CFLAGS=-I. -I${GNUHOSTDIST}/libobjc   -g  -W -Wall -Wwrite-strings 
-Wstrict-prototypes -DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing -fexceptions
-G_INCLUDES=-I${GNUHOSTDIST}/libobjc/objc  -I${GNUHOSTDIST}/libobjc/../gcc 
-I${GNUHOSTDIST}/libobjc/../gcc/config -I../.././gcc 
-I${GNUHOSTDIST}/libobjc/../include 
+G_ALL_CFLAGS=-I. -I/home/drochner/netbsd/work/external/gpl3/gcc/dist/libobjc   
-g  -W -Wall -Wwrite-strings -Wstrict-prototypes -DIN_GCC -DIN_TARGET_LIBS 
-fno-strict-aliasing -fexceptions
+G_INCLUDES=-I/home/drochner/netbsd/work/external/gpl3/gcc/dist/libobjc/objc  
-I/home/drochner/netbsd/work/external/gpl3/gcc/dist/libobjc/../gcc 
-I/home/drochner/netbsd/work/external/gpl3/gcc/dist/libobjc/../gcc/config 
-I../.././gcc 
-I/home/drochner/netbsd/work/external/gpl3/gcc/dist/libobjc/../include 
 G_OBJS=archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo 
misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo Protocol.lo sarray.lo 
selector.lo sendmsg.lo thr.lo thr-objc.lo exception.lo
 G_OBJC_H=hash.h objc-list.h sarray.h objc.h objc-api.h NXConstStr.h Object.h 
Protocol.h encoding.h typedstream.h thr.h objc-decls.h
 G_UNWIND_H=${GNUHOSTDIST}/gcc/unwind-generic.h
diff -r 734343ce70d4 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h  Tue Jul 05 
12:05:12 2011 +0200
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h  Tue Jul 05 
17:58:34 2011 +0200
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from:     NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp 
 */
+/* Generated from:     NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp 
 */
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  
*/
 
 // Predefined symbols and macros -*- C++ -*-
@@ -788,7 +788,7 @@
 /* #undef _GLIBCXX_HAVE_TANL */
 
 /* Define to 1 if you have the <tgmath.h> header file. */
-/* #undef _GLIBCXX_HAVE_TGMATH_H */
+#define _GLIBCXX_HAVE_TGMATH_H 1
 
 /* Define to 1 if the target supports thread-local storage. */
 /* #undef _GLIBCXX_HAVE_TLS */
diff -r 734343ce70d4 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h     Tue Jul 05 
12:05:12 2011 +0200
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h     Tue Jul 05 
17:58:34 2011 +0200
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from:     NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp 
 */
+/* Generated from:     NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp 
 */
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  
*/
 
 /* config.h.  Generated from config.h.in by configure.  */
@@ -409,7 +409,7 @@
 /* #undef HAVE_TANL */
 
 /* Define to 1 if you have the <tgmath.h> header file. */
-/* #undef HAVE_TGMATH_H */
+#define HAVE_TGMATH_H 1
 
 /* Define to 1 if the target supports thread-local storage. */
 /* #undef HAVE_TLS */
diff -r 734343ce70d4 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk      Tue Jul 05 
12:05:12 2011 +0200
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk      Tue Jul 05 
17:58:34 2011 +0200
@@ -1,11 +1,11 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from:      NetBSD: mknative-gcc,v 1.54 2011/06/30 07:01:14 mrg Exp 
+# Generated from:      NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_LIBSUPCXX_SOURCES=array_type_info.cc atexit_arm.cc bad_cast.cc bad_typeid.cc 
class_type_info.cc del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc dyncast.cc 
eh_alloc.cc eh_arm.cc eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc 
eh_globals.cc eh_personality.cc eh_ptr.cc eh_term_handler.cc eh_terminate.cc 
eh_throw.cc eh_type.cc eh_unex_handler.cc enum_type_info.cc 
function_type_info.cc fundamental_type_info.cc guard.cc new_handler.cc 
new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pbase_type_info.cc 
pmem_type_info.cc pointer_type_info.cc pure.cc si_class_type_info.cc tinfo.cc 
tinfo2.cc vec.cc vmi_class_type_info.cc vterminate.cc
 G_LIBSUPCXX_C_SOURCES=cp-demangle.c 
 G_SRC_SOURCES=atomic.cc bitmap_allocator.cc pool_allocator.cc mt_allocator.cc 
codecvt.cc compatibility.cc compatibility-c++0x.cc compatibility-debug_list.cc 
compatibility-list.cc complex_io.cc ctype.cc debug.cc functexcept.cc 
globals_io.cc hash_c++0x.cc hash_tr1.cc hashtable_c++0x.cc hashtable_tr1.cc 
ios.cc ios_failure.cc ios_init.cc ios_locale.cc limits.cc list.cc debug_list.cc 
locale.cc locale_init.cc locale_facets.cc localename.cc math_stubs_float.cc 
math_stubs_long_double.cc stdexcept.cc strstream.cc system_error.cc tree.cc 
allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc ios-inst.cc 
iostream-inst.cc istream-inst.cc istream.cc locale-inst.cc misc-inst.cc 
ostream-inst.cc sstream-inst.cc streambuf-inst.cc streambuf.cc string-inst.cc 
valarray-inst.cc wlocale-inst.cc wstring-inst.cc mutex.cc condition_variable.cc 
chrono.cc thread.cc future.cc atomicity.cc codecvt_members.cc 
collate_members.cc ctype_members.cc messages_members.cc monetary_members.cc 
numeric_membe
 r!
s.cc time_members.cc  basic_file.cc c++locale.cc  parallel_list.cc 
parallel_settings.cc compatibility-parallel_list.cc 
-G_atomicity_file=${GNUHOSTDIST}/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h
+G_atomicity_file=/home/drochner/netbsd/work/external/gpl3/gcc/dist/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h
 G_CCODECVT_CC=config/locale/generic/codecvt_members.cc
 G_CCOLLATE_CC=config/locale/generic/collate_members.cc
 G_CCTYPE_CC=config/locale/generic/ctype_members.cc
diff -r 734343ce70d4 external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h      Tue Jul 05 
12:05:12 2011 +0200
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h      Tue Jul 05 
17:58:34 2011 +0200
@@ -3,7 +3,7 @@
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  
*/
 
 /* Generated automatically. */
-static const char configuration_arguments[] = 
"/usr/src3/tools/gcc/../../external/gpl3/gcc/dist/configure 
--target=i486--netbsdelf --enable-long-long --enable-threads 
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD 
nb1 20110620' --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona 
--with-mpc=/var/obj/i386/usr/src3/destdir.i386/usr 
--with-mpfr=/var/obj/i386/usr/src3/destdir.i386/usr 
--with-gmp=/var/obj/i386/usr/src3/destdir.i386/usr --disable-multilib 
--disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd5.99.48 
--host=i486--netbsdelf : (reconfigured) 
/usr/src3/tools/gcc/../../external/gpl3/gcc/dist/configure 
--target=i486--netbsdelf --enable-long-long --enable-threads 
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD 
nb1 20110620' --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona 
--with-mpc=/var/obj/i386/usr/src3/destdir.i386/usr 
--with-mpfr=/var/obj/i386/usr/src3/destdir.i386/usr --w
 i!
th-gmp=/var/obj/i386/usr/src3/destdir.i386/usr --disable-multilib 
--disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd5.99.48 
--host=i486--netbsdelf";
+static const char configuration_arguments[] = 
"/home/drochner/netbsd/work/tools/gcc/../../external/gpl3/gcc/dist/configure 
--target=i486--netbsdelf --enable-long-long --enable-threads 
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD 
nb1 20110620' --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona 
--with-mpc=//usr --with-mpfr=//usr --with-gmp=//usr --disable-multilib 
--disable-symvers --disable-libstdcxx-pch --build=i386-unknown-netbsdelf5.99.54 
--host=i486--netbsdelf";
 static const char thread_model[] = "posix";
 
 static const struct {
diff -r 734343ce70d4 external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk
--- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk   Tue Jul 05 12:05:12 
2011 +0200
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk   Tue Jul 05 17:58:34 
2011 +0200
@@ -42,7 +42,7 @@
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h 
${GNUHOSTDIST}/gcc/lto/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/i386/i386-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  
unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o 
decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o 
init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o 
cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o 
attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o 
i386-c.o c-pretty-print.o c-opts.o c-pch.o incpath.o c-ppoutput.o 
c-cppbuiltin.o prefix.o c-gimplify.o c-omp.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o 
c-dump.o i386-c.o c-pretty-print.o c-opts.o c-pch.o incpath.o c-ppoutput.o 
c-cppbuiltin.o prefix.o c-gimplify.o c-omp.o
 G_F77_OBJS=
diff -r 734343ce70d4 external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Tue Jul 05 
12:05:12 2011 +0200
+++ b/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Tue Jul 05 
17:58:34 2011 +0200
@@ -180,7 +180,7 @@
 dummy:
        mkdir dummy
 ${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
-       cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET}
+       cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
 
 .for _build _src in ${ASM_SRCS_LIST}
 ${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
diff -r 734343ce70d4 gnu/dist/gcc4/gcc/gthr-posix.h
--- a/gnu/dist/gcc4/gcc/gthr-posix.h    Tue Jul 05 12:05:12 2011 +0200
+++ b/gnu/dist/gcc4/gcc/gthr-posix.h    Tue Jul 05 17:58:34 2011 +0200
@@ -68,7 +68,7 @@
   __gthrw_pragma(weak type)
 # else
 # define __gthrw2(name,name2,type) \
-  extern __typeof(type) name __attribute__ ((__weakref__(#name2))); \
+  static __typeof(type) name __attribute__ ((__weakref__(#name2))); \
   __gthrw_pragma(weak type)
 # endif
 # define __gthrw_(name) __gthrw_ ## name


Home | Main Index | Thread Index | Old Index