From patchwork Tue Jul 12 16:24:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 104406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 6F1771007D1 for ; Wed, 13 Jul 2011 02:25:27 +1000 (EST) Received: (qmail 25225 invoked by alias); 12 Jul 2011 16:25:22 -0000 Received: (qmail 25209 invoked by uid 22791); 12 Jul 2011 16:25:20 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, TW_DP, TW_MT, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 12 Jul 2011 16:24:42 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 12C97771; Tue, 12 Jul 2011 18:24:41 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qBtyNXNRN43c; Tue, 12 Jul 2011 18:24:33 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id E0054770; Tue, 12 Jul 2011 18:24:33 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p6CGOX5a006767; Tue, 12 Jul 2011 18:24:33 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Paolo Bonzini , Richard Sandiford Subject: [build] Move sync, mips16.S to toplevel libgcc Date: Tue, 12 Jul 2011 18:24:33 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Another easy part in the toplevel libgcc move was sync.c and related stuff. While doing this, it turned out to be easier to move the rest of gcc/config/mips/t-libgcc-mips16 rather than leave it behind. The patch is untested except for including it in a mips-sgi-irix6.5 build to make sure it is syntactically correct, but I don't have mips16 system to actually test. Richard, could you give it a whirl? Ok for mainline? Thanks. Rainer 2011-07-10 Rainer Orth gcc: * config/sync.c: Move to ../libgcc. * Makefile.in (libgcc.mvars): Remove LIBGCC_SYNC, LIBGCC_SYNC_CFLAGS. * config/mips/t-libgcc-mips16: Move to ../libgcc/config/mips. * config/mips/libgcc-mips16.ver: Likewise. * config/mips/mips16.S: Likewise. * config.gcc (mips64*-*-linux*): Remove mips/t-libgcc-mips16 from tmake_file. (mips*-*-linux*): Likewise. (mips*-sde-elf*): Likewise. (mipsisa32-*-elf*): Likewise. (mipsisa64sb1-*-elf*): Likewise. (mips-*-elf*): Likewise. (mips64-*-elf*): Likewise. (mips64orion-*-elf*): Likewise. (mips*-*-rtems*): Likewise. (mipstx39-*-elf*): Likewise. libgcc: * sync.c: New file. * config/mips/t-mips16: New file. * config.host (mips64*-*-linux*): Add mips/t-mips16 to tmake_file. (mips*-*-linux*): Likewise. (mips*-sde-elf*): Likewise. (mipsisa32-*-elf*): Join with mipsisa32r2-*-elf*, mipsisa64-*-elf*, mipsisa64r2-*-elf*. Add mips/t-mips16 to tmake_file. (mipsisa64sb1-*-elf*): Add mips/t-mips16 to tmake_file. (mips-*-elf*): Likewise. (mips64-*-elf*): Likewise. (mips64orion-*-elf*): Likewise. (mips*-*-rtems*): Likewise. (mipstx39-*-elf*): Likewise. * Makefile.in: Use SYNC instead of LIBGCC_SYNC. ($(libgcc-sync-size-funcs-o)): Use SYNC_CFLAGS instead of LIBGCC_SYNC_CFLAGS. Use $(srcdir) to refer to sync.c. Use $<. ($(libgcc-sync-funcs-o)): Likewise. ($(libgcc-sync-size-funcs-s-o)): Likewise. ($(libgcc-sync-funcs-s-o)): Likewise. diff --git a/gcc/Makefile.in b/gcc/Makefile.in --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1882,8 +1882,6 @@ libgcc.mvars: config.status Makefile $(L echo SHLIB_NM_FLAGS = '$(SHLIB_NM_FLAGS)' >> tmp-libgcc.mvars echo LIBGCC2_CFLAGS = '$(LIBGCC2_CFLAGS)' >> tmp-libgcc.mvars echo TARGET_LIBGCC2_CFLAGS = '$(TARGET_LIBGCC2_CFLAGS)' >> tmp-libgcc.mvars - echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars - echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars diff --git a/gcc/config.gcc b/gcc/config.gcc --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1829,7 +1829,7 @@ mips*-*-netbsd*) # NetBSD/mips, either ;; mips64*-*-linux* | mipsisa64*-*-linux*) tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h" - tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16" + tmake_file="${tmake_file} mips/t-linux64" tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32" case ${target} in mips64el-st-linux-gnu) @@ -1850,7 +1850,6 @@ mips64*-*-linux* | mipsisa64*-*-linux*) ;; mips*-*-linux*) # Linux MIPS, either endian. tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h" - tmake_file="${tmake_file} mips/t-libgcc-mips16" case ${target} in mipsisa32r2*) tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33" @@ -1873,7 +1872,7 @@ mips*-*-openbsd*) ;; mips*-sde-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/sde.h" - tmake_file="mips/t-sde mips/t-libgcc-mips16" + tmake_file="mips/t-sde" extra_options="${extra_options} mips/sde.opt" case "${with_newlib}" in yes) @@ -1910,7 +1909,7 @@ mipsisa32r2-*-elf* | mipsisa32r2el-*-elf mipsisa64-*-elf* | mipsisa64el-*-elf* | \ mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h" - tmake_file="mips/t-isa3264 mips/t-libgcc-mips16" + tmake_file="mips/t-isa3264" case ${target} in mipsisa32r2*) tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33" @@ -1947,17 +1946,17 @@ mipsisa64sr71k-*-elf*) ;; mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h" - tmake_file="mips/t-elf mips/t-libgcc-mips16 mips/t-sb1" + tmake_file="mips/t-elf mips/t-sb1" target_cpu_default="MASK_64BIT|MASK_FLOAT64" tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64" ;; mips-*-elf* | mipsel-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h" - tmake_file="mips/t-elf mips/t-libgcc-mips16" + tmake_file="mips/t-elf" ;; mips64-*-elf* | mips64el-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h" - tmake_file="mips/t-elf mips/t-libgcc-mips16" + tmake_file="mips/t-elf" target_cpu_default="MASK_64BIT|MASK_FLOAT64" tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64" ;; @@ -1968,13 +1967,13 @@ mips64vr-*-elf* | mips64vrel-*-elf*) ;; mips64orion-*-elf* | mips64orionel-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elforion.h mips/elf.h" - tmake_file="mips/t-elf mips/t-libgcc-mips16" + tmake_file="mips/t-elf" target_cpu_default="MASK_64BIT|MASK_FLOAT64" tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64" ;; mips*-*-rtems*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/rtems.h rtems.h" - tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems" + tmake_file="mips/t-elf t-rtems mips/t-rtems" ;; mips-wrs-vxworks) tm_file="elfos.h ${tm_file} mips/elf.h vx-common.h vxworks.h mips/vxworks.h" @@ -1982,7 +1981,7 @@ mips-wrs-vxworks) ;; mipstx39-*-elf* | mipstx39el-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file} mips/r3900.h mips/elf.h" - tmake_file="mips/t-r3900 mips/t-libgcc-mips16" + tmake_file="mips/t-r3900" ;; mmix-knuth-mmixware) tm_file="${tm_file} newlib-stdint.h" diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -648,7 +648,7 @@ endif endif -ifeq ($(LIBGCC_SYNC),yes) +ifeq ($(SYNC),yes) libgcc-sync-size-funcs := $(foreach op, add sub or and xor nand, \ sync_fetch_and_$(op) \ sync_$(op)_and_fetch) \ @@ -661,37 +661,37 @@ libgcc-sync-size-funcs := $(foreach pref $(prefix)_$(suffix))) libgcc-sync-size-funcs-o = $(patsubst %,%$(objext),$(libgcc-sync-size-funcs)) -$(libgcc-sync-size-funcs-o): %$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-size-funcs-o): %$(objext): $(srcdir)/sync.c + $(gcc_compile) $(SYNC_CFLAGS) \ -DFN=`echo "$*" | sed 's/_[^_]*$$//'` \ -DSIZE=`echo "$*" | sed 's/.*_//'` \ - -c $(gcc_srcdir)/config/sync.c $(vis_hide) + -c $< $(vis_hide) libgcc-objects += $(libgcc-sync-size-funcs-o) libgcc-sync-funcs := sync_synchronize libgcc-sync-funcs-o = $(patsubst %,%$(objext),$(libgcc-sync-funcs)) -$(libgcc-sync-funcs-o): %$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-funcs-o): %$(objext): $(srcdir)/sync.c + $(gcc_compile) $(SYNC_CFLAGS) \ -DL$* \ - -c $(gcc_srcdir)/config/sync.c $(vis_hide) + -c $< $(vis_hide) libgcc-objects += $(libgcc-sync-funcs-o) ifeq ($(enable_shared),yes) libgcc-sync-size-funcs-s-o = $(patsubst %,%_s$(objext), \ $(libgcc-sync-size-funcs)) -$(libgcc-sync-size-funcs-s-o): %_s$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_s_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-size-funcs-s-o): %_s$(objext): $(srcdir)/sync.c + $(gcc_s_compile) $(SYNC_CFLAGS) \ -DFN=`echo "$*" | sed 's/_[^_]*$$//'` \ -DSIZE=`echo "$*" | sed 's/.*_//'` \ - -c $(gcc_srcdir)/config/sync.c + -c $< libgcc-s-objects += $(libgcc-sync-size-funcs-s-o) libgcc-sync-funcs-s-o = $(patsubst %,%_s$(objext),$(libgcc-sync-funcs)) -$(libgcc-sync-funcs-s-o): %_s$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_s_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-funcs-s-o): %_s$(objext): $(srcdir)/sync.c + $(gcc_s_compile) $(SYNC_CFLAGS) \ -DL$* \ - -c $(gcc_srcdir)/config/sync.c + -c $< libgcc-s-objects += $(libgcc-sync-funcs-s-o) endif endif diff --git a/libgcc/config.host b/libgcc/config.host --- a/libgcc/config.host +++ b/libgcc/config.host @@ -540,12 +540,12 @@ mips*-*-netbsd*) # NetBSD/mips, either ;; mips64*-*-linux* | mipsisa64*-*-linux*) extra_parts="$extra_parts crtfastmath.o" - tmake_file="${tmake_file} t-crtfm mips/t-tpbit" + tmake_file="${tmake_file} t-crtfm mips/t-mips16 mips/t-tpbit" md_unwind_header=mips/linux-unwind.h ;; mips*-*-linux*) # Linux MIPS, either endian. extra_parts="$extra_parts crtfastmath.o" - tmake_file="${tmake_file} t-crtfm" + tmake_file="${tmake_file} t-crtfm mips/t-mips16" md_unwind_header=mips/linux-unwind.h ;; mips*-*-openbsd*) @@ -560,33 +560,38 @@ mips*-sde-elf*) tmake_file=mips/t-sdemtk ;; esac + tmake_file="$tmake_file mips/t-mips16" ;; -mipsisa32-*-elf* | mipsisa32el-*-elf*) - ;; -mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*) - ;; -mipsisa64-*-elf* | mipsisa64el-*-elf*) - ;; +mipsisa32-*-elf* | mipsisa32el-*-elf* | \ +mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \ +mipsisa64-*-elf* | mipsisa64el-*-elf* | \ mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mipsisa64sr71k-*-elf*) tmake_file=t-fdpbit ;; mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips-*-elf* | mipsel-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips64-*-elf* | mips64el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips64vr-*-elf* | mips64vrel-*-elf*) ;; mips64orion-*-elf* | mips64orionel-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips*-*-rtems*) + tmake_file="$tmake_file mips/t-mips16" ;; mips-wrs-vxworks) ;; mipstx39-*-elf* | mipstx39el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mmix-knuth-mmixware) extra_parts="crti.o crtn.o crtbegin.o crtend.o" diff --git a/gcc/config/mips/libgcc-mips16.ver b/libgcc/config/mips/libgcc-mips16.ver rename from gcc/config/mips/libgcc-mips16.ver rename to libgcc/config/mips/libgcc-mips16.ver diff --git a/gcc/config/mips/mips16.S b/libgcc/config/mips/mips16.S rename from gcc/config/mips/mips16.S rename to libgcc/config/mips/mips16.S diff --git a/gcc/config/mips/t-libgcc-mips16 b/libgcc/config/mips/t-mips16 rename from gcc/config/mips/t-libgcc-mips16 rename to libgcc/config/mips/t-mips16 --- a/gcc/config/mips/t-libgcc-mips16 +++ b/libgcc/config/mips/t-mips16 @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 2011 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -38,8 +38,8 @@ LIB1ASMFUNCS = _m16addsf3 _m16subsf3 _m1 _m16stubdc0 _m16stubdc1 _m16stubdc2 _m16stubdc5 _m16stubdc6 \ _m16stubdc9 _m16stubdc10 -LIBGCC_SYNC = yes -LIBGCC_SYNC_CFLAGS = -mno-mips16 +SYNC = yes +SYNC_CFLAGS = -mno-mips16 # Version these symbols if building libgcc.so. SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver diff --git a/gcc/config/sync.c b/libgcc/sync.c rename from gcc/config/sync.c rename to libgcc/sync.c --- a/gcc/config/sync.c +++ b/libgcc/sync.c @@ -1,5 +1,5 @@ /* Out-of-line libgcc versions of __sync_* builtins. */ -/* Copyright (C) 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -22,8 +22,8 @@ a copy of the GCC Runtime Library Except see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ -/* This file is used by targets whose makefiles define LIBGCC_SYNC - to "yes". It is compiled with LIBGCC_SYNC_CFLAGS and provides +/* This file is used by targets whose makefiles define SYNC + to "yes". It is compiled with SYNC_CFLAGS and provides out-of-line versions of all relevant __sync_* primitives. These routines are intended for targets like MIPS that have two