From c192cee6838eea5956fc53055531d6d463cd2b6e Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 3 Jun 2011 16:07:21 +0000 Subject: [PATCH] Makefile.in (LIB2ADDEHDEP): Remove. gcc: * Makefile.in (LIB2ADDEHDEP): Remove. * config/arm/t-bpabi (LIB2ADDEHDEP): Remove. * config/arm/t-symbian (LIB2ADDEHDEP): Remove. * config/picochip/t-picochip (LIB2ADDEHDEP): Remove. * config/t-darwin (LIB2ADDEHDEP): Remove. * config/t-freebsd (LIB2ADDEHDEP): Remove. * config/t-linux (LIB2ADDEHDEP): Remove. libgcc: * config/s390/t-tpf (LIB2ADDEHDEP): Remove. * config/t-sol2 (LIB2ADDEH): Use gcc_srcdir, add emutls.c. From-SVN: r174606 --- gcc/ChangeLog | 10 ++++++++++ gcc/Makefile.in | 1 - gcc/config/arm/t-bpabi | 3 +-- gcc/config/arm/t-symbian | 3 +-- gcc/config/picochip/t-picochip | 3 +-- gcc/config/t-darwin | 1 - gcc/config/t-freebsd | 1 - gcc/config/t-linux | 1 - gcc/config/t-sol2 | 1 - libgcc/ChangeLog | 5 +++++ libgcc/config/s390/t-tpf | 1 - libgcc/config/t-sol2 | 4 ++-- 12 files changed, 20 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86245dd79b1..2cc42440a6a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2011-06-03 Rainer Orth + + * Makefile.in (LIB2ADDEHDEP): Remove. + * config/arm/t-bpabi (LIB2ADDEHDEP): Remove. + * config/arm/t-symbian (LIB2ADDEHDEP): Remove. + * config/picochip/t-picochip (LIB2ADDEHDEP): Remove. + * config/t-darwin (LIB2ADDEHDEP): Remove. + * config/t-freebsd (LIB2ADDEHDEP): Remove. + * config/t-linux (LIB2ADDEHDEP): Remove. + 2011-06-03 Diego Novillo * lto-streamer-in.c (get_resolution): Move to lto/lto.c. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 70eb9fb3300..81736a045a0 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -683,7 +683,6 @@ LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c LIB2ADDEHSTATIC = $(LIB2ADDEH) LIB2ADDEHSHARED = $(LIB2ADDEH) -LIB2ADDEHDEP = $(UNWIND_H) unwind-pe.h unwind.inc unwind-dw2-fde.h unwind-dw2.h # Don't build libunwind by default. LIBUNWIND = diff --git a/gcc/config/arm/t-bpabi b/gcc/config/arm/t-bpabi index 61da9ec7b4c..78812b35bd8 100644 --- a/gcc/config/arm/t-bpabi +++ b/gcc/config/arm/t-bpabi @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2011 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -29,7 +29,6 @@ UNWIND_H = $(srcdir)/config/arm/unwind-arm.h LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \ $(srcdir)/config/arm/libunwind.S \ $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = $(UNWIND_H) $(srcdir)/config/$(LIB1ASMSRC) # Add the BPABI names. SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver diff --git a/gcc/config/arm/t-symbian b/gcc/config/arm/t-symbian index 4a1476f6791..3be83f445aa 100644 --- a/gcc/config/arm/t-symbian +++ b/gcc/config/arm/t-symbian @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2008, 2011 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -33,7 +33,6 @@ LIB1ASMFUNCS += \ # Include the gcc personality routine UNWIND_H = $(srcdir)/config/arm/unwind-arm.h LIB2ADDEH = $(srcdir)/unwind-c.c $(srcdir)/config/arm/pr-support.c -LIB2ADDEHDEP = $(UNWIND_H) # Include half-float helpers. LIB2FUNCS_STATIC_EXTRA = $(srcdir)/config/arm/fp16.c diff --git a/gcc/config/picochip/t-picochip b/gcc/config/picochip/t-picochip index c74c12d309f..ba4394eceeb 100644 --- a/gcc/config/picochip/t-picochip +++ b/gcc/config/picochip/t-picochip @@ -1,4 +1,4 @@ -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2011 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -45,7 +45,6 @@ LIB1ASMSRC = picochip/libgccExtras/fake_libgcc.asm # Turn off the building of exception handling libraries. LIB2ADDEH = -LIB2ADDEHDEP = # Turn off ranlib on target libraries. RANLIB_FOR_TARGET = cat diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin index 1faafbe89d3..2703e85f35a 100644 --- a/gcc/config/t-darwin +++ b/gcc/config/t-darwin @@ -54,7 +54,6 @@ $(T)crt3$(objext): $(srcdir)/config/darwin-crt3.c $(GCC_PASSES) \ # Use unwind-dw2-fde-darwin LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-darwin.c \ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c # -pipe because there's an assembler bug, 4077127, which causes # it to not properly process the first # directive, causing temporary diff --git a/gcc/config/t-freebsd b/gcc/config/t-freebsd index 276e2d7a5ad..af2df24f105 100644 --- a/gcc/config/t-freebsd +++ b/gcc/config/t-freebsd @@ -7,4 +7,3 @@ TARGET_LIBGCC2_CFLAGS += -fPIC # Use unwind-dw2-fde-glibc LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c diff --git a/gcc/config/t-linux b/gcc/config/t-linux index 38b3b58d9f4..039fa27ae82 100644 --- a/gcc/config/t-linux +++ b/gcc/config/t-linux @@ -29,4 +29,3 @@ SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver # Use unwind-dw2-fde-glibc LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c diff --git a/gcc/config/t-sol2 b/gcc/config/t-sol2 index 4f1c67e919b..73fd8eb3667 100644 --- a/gcc/config/t-sol2 +++ b/gcc/config/t-sol2 @@ -36,4 +36,3 @@ TARGET_LIBGCC2_CFLAGS = -fPIC # are present, automatically falls back to unwind-dw2-fde.c. LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 7f8050cd446..9eb6e07cb70 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2011-06-03 Rainer Orth + + * config/s390/t-tpf (LIB2ADDEHDEP): Remove. + * config/t-sol2 (LIB2ADDEH): Use gcc_srcdir, add emutls.c. + 2011-06-03 Rainer Orth * configure.ac (target_thread_file): Determine thread model. diff --git a/libgcc/config/s390/t-tpf b/libgcc/config/s390/t-tpf index 7890d27297e..2110c688d5f 100644 --- a/libgcc/config/s390/t-tpf +++ b/libgcc/config/s390/t-tpf @@ -5,4 +5,3 @@ HOST_LIBGCC2_CFLAGS += -fPIC LIB2ADDEH = $(gcc_srcdir)/unwind-dw2.c $(gcc_srcdir)/unwind-dw2-fde-glibc.c \ $(gcc_srcdir)/unwind-sjlj.c $(gcc_srcdir)/unwind-c.c \ $(gcc_srcdir)/emutls.c -LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h diff --git a/libgcc/config/t-sol2 b/libgcc/config/t-sol2 index 2adcb13a820..e55c64f646d 100644 --- a/libgcc/config/t-sol2 +++ b/libgcc/config/t-sol2 @@ -18,8 +18,8 @@ # Use unwind-dw2-fde-glibc.c. Unless linker support and dl_iterate_phdr # are present, automatically falls back to unwind-dw2-fde.c. -LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \ - $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c +LIB2ADDEH = $(gcc_srcdir)/unwind-dw2.c $(gcc_srcdir)/unwind-dw2-fde-glibc.c \ + $(gcc_srcdir)/unwind-sjlj.c $(gcc_srcdir)/unwind-c.c $(gcc_srcdir)/emutls.c # gmon build rule: gmon.o: $(srcdir)/config/gmon-sol2.c -- 2.30.2