summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2019-03-12 16:39:45 -0400
committermidipix <writeonce@midipix.org>2019-03-12 18:52:14 -0400
commit504090d18863480ef00c2d0e4807e34bd6103294 (patch)
tree4018d58c7b21125e9c0c1ded09364628a314a25e
parent0917764f5d75d5dba18ca3747e8ce0b6e4851cf4 (diff)
downloadcbb-gcc-4.6.4-504090d18863480ef00c2d0e4807e34bd6103294.tar.bz2
cbb-gcc-4.6.4-504090d18863480ef00c2d0e4807e34bd6103294.tar.xz
midipix targets: crtbegin & crtend objs now provided by musl libc (via mmglue).
-rw-r--r--gcc/config/i386/midipix.c4
-rw-r--r--gcc/config/i386/midipix_crtbegin.c22
-rw-r--r--gcc/config/i386/midipix_crtend.c23
-rw-r--r--gcc/config/i386/t-midipix15
-rw-r--r--libgcc/config/i386/t-midipix23
5 files changed, 7 insertions, 80 deletions
diff --git a/gcc/config/i386/midipix.c b/gcc/config/i386/midipix.c
index a8a1b615f..8b920a8e7 100644
--- a/gcc/config/i386/midipix.c
+++ b/gcc/config/i386/midipix.c
@@ -354,8 +354,10 @@ void midipix_seh_hook__pe_seh_unwind_emit(FILE * f, rtx r)
void midipix_seh_hook__pe_seh_emit_except_personality(rtx personality)
{
+ /* .__lang_personality_seh0 thunk */
fputs("\t.seh_handler\t",asm_out_file);
- output_addr_const (asm_out_file, personality);
+ fputs(".",asm_out_file);
+ output_addr_const(asm_out_file,personality);
fputs(", @unwind, @except\n",asm_out_file);
}
diff --git a/gcc/config/i386/midipix_crtbegin.c b/gcc/config/i386/midipix_crtbegin.c
deleted file mode 100644
index 46c7d0204..000000000
--- a/gcc/config/i386/midipix_crtbegin.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************/
-/* */
-/* midipix_crtbegin.c: a standard start file for the midipix targets */
-/* */
-/* Copyright (C) 2014,2015 Z. Gilboa */
-/* */
-/* This program is free software: you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation, either version 3 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* */
-/*****************************************************************************/
-
-int __dso_handle = 0;
diff --git a/gcc/config/i386/midipix_crtend.c b/gcc/config/i386/midipix_crtend.c
deleted file mode 100644
index 3f15e8827..000000000
--- a/gcc/config/i386/midipix_crtend.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************/
-/* */
-/* midipix_crtend.c: a standard end file for the midipix targets */
-/* */
-/* Copyright (C) 2014,2015 Z. Gilboa */
-/* */
-/* This program is free software: you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation, either version 3 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* */
-/*****************************************************************************/
-
-/* required functionality provided by libc and the system call layer */
-typedef int dummy;
diff --git a/gcc/config/i386/t-midipix b/gcc/config/i386/t-midipix
index 56e29c484..b73e9b34f 100644
--- a/gcc/config/i386/t-midipix
+++ b/gcc/config/i386/t-midipix
@@ -86,18 +86,3 @@ SHLIB_INSTALL = \
$(INSTALL_DATA) \
$(SHLIB_DIR)/$(SHLIB_IMPLIB) \
$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_IMPLIB); \
- $(INSTALL_DATA) \
- $(SHLIB_DIR)/crtbegin.o \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/crtbegin.o; \
- $(INSTALL_DATA) \
- $(SHLIB_DIR)/crtbeginS.o \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/crtbeginS.o; \
- $(INSTALL_DATA) \
- $(SHLIB_DIR)/crtbeginT.o \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/crtbeginT.o; \
- $(INSTALL_DATA) \
- $(SHLIB_DIR)/crtend.o \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/crtend.o; \
- $(INSTALL_DATA) \
- $(SHLIB_DIR)/crtendS.o \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/crtendS.o;
diff --git a/libgcc/config/i386/t-midipix b/libgcc/config/i386/t-midipix
index c04a8e633..5792377f5 100644
--- a/libgcc/config/i386/t-midipix
+++ b/libgcc/config/i386/t-midipix
@@ -2,7 +2,7 @@
## ##
## midipix target-specific build recipes for libgcc ##
## ##
-## Copyright (C) 2014,2015 Z. Gilboa ##
+## Copyright (C) 2014,2015,2019 Z. Gilboa ##
## ##
## This program is free software: you can redistribute it and/or modify ##
## it under the terms of the GNU General Public License as published by ##
@@ -19,23 +19,8 @@
## ##
###############################################################################
-CUSTOM_CRTSTUFF := yes
-
-libgcc-crt-objects = \
- crtbegin$(objext) crtbeginS$(objext) crtbeginT$(objext) \
- crtend$(objext) crtendS$(objext)
-
-crtbegin$(objext): $(gcc_srcdir)/config/i386/midipix_crtbegin.c
- $(GCC_FOR_TARGET) -DLIBGCC_CRTBEGIN -c $(gcc_srcdir)/config/i386/midipix_crtbegin.c -o $@
+# crtbegin & crtend objects provided by the system library (libc) via mmglue.
-crtbeginS$(objext): $(gcc_srcdir)/config/i386/midipix_crtbegin.c
- $(GCC_FOR_TARGET) -DLIBGCC_CRTBEGIN_S -c $(gcc_srcdir)/config/i386/midipix_crtbegin.c -o $@
-
-crtbeginT$(objext): $(gcc_srcdir)/config/i386/midipix_crtbegin.c
- $(GCC_FOR_TARGET) -DLIBGCC_CRTBEGIN_T -c $(gcc_srcdir)/config/i386/midipix_crtbegin.c -o $@
-
-crtend$(objext): $(gcc_srcdir)/config/i386/midipix_crtend.c
- $(GCC_FOR_TARGET) -DLIBGCC_CRTEND -c $(gcc_srcdir)/config/i386/midipix_crtend.c -o $@
+CUSTOM_CRTSTUFF := yes
-crtendS$(objext): $(gcc_srcdir)/config/i386/midipix_crtend.c
- $(GCC_FOR_TARGET) -DLIBGCC_CRTEND_S -c $(gcc_srcdir)/config/i386/midipix_crtend.c -o $@
+libgcc-crt-objects =