* drop libgcc from coreboot_apc.o, not needed.

* wrap libgcc calls into regparm(0) variants so that coreboot can be compiled
  with other regparm values

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4679 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/config/Config.lb b/src/config/Config.lb
index dcf6c6518830b76601949fc095de914b609d83e4..061c0b21a8583f006f3c6231f4997e893272da79 100644 (file)
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -47,7 +47,7 @@ end
 
 makerule coreboot_ram.o
        depends "src/arch/$(CONFIG_ARCH)/lib/c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)" 
-       action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ src/arch/$(CONFIG_ARCH)/lib/c_start.o $(DRIVER) -Wl,-\( coreboot.a $(LIBGCC_FILE_NAME) -Wl,-\)"
+       action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ src/arch/$(CONFIG_ARCH)/lib/c_start.o $(DRIVER) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,-\( coreboot.a $(LIBGCC_FILE_NAME) -Wl,-\)"
 end
 
 makerule coreboot_ram
@@ -89,7 +89,7 @@ if CONFIG_AP_CODE_IN_CAR
        end
 
        makerule coreboot_apc.o
-               depends "src/arch/$(CONFIG_ARCH)/lib/c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
+               depends "src/arch/$(CONFIG_ARCH)/lib/c_start.o coreboot_apc.a"
                action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ $^"
        end
 

diff --git a/src/lib/Config.lb b/src/lib/Config.lb
index 64682da648eedff875a9116990c85ea894e13415..7569d856f056a9517a208469a92912247c85fc22 100644 (file)
--- a/src/lib/Config.lb
+++ b/src/lib/Config.lb
@@ -17,6 +17,8 @@ object delay.o
 object fallback_boot.o
 object compute_ip_checksum.o
 object version.o
+object gcc.o
+
 # Force version.o to recompile every time
 makedefine .PHONY : version.o
 

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 65abde0d53e6cef5e92cdaf0efe478faca272400..ebf6fd2a8d405103461be5066a7460566bd03af8 100644 (file)
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -12,6 +12,7 @@ obj-y += version.o
 obj-y += cbfs.o
 obj-y += lzma.o
 #obj-y += lzmadecode.o
+obj-y += gcc.o
 
 initobj-y += uart8250.o
 initobj-y += memset.o

diff --git a/src/lib/gcc.c b/src/lib/gcc.c
new file mode 100644 (file)
index 0000000..edd3eb9
--- /dev/null
+++ b/src/lib/gcc.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 coresystems GmbH
+ *
+ * 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; version 2 of the License.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ */
+
+/* GCC's libgcc handling is quite broken. While the libgcc functions
+ * are always regparm(0) the code that calls them uses whatever the
+ * compiler call specifies. Therefore we need a wrapper around those
+ * functions. See gcc bug PR41055 for more information.
+ */
+
+#define WRAP_LIBGCC_CALL(type, name) \
+       type __real_##name(type a, type b) __attribute__((regparm(0))); \
+       type __wrap_##name(type a, type b) { return __real_##name(a, b); }
+
+WRAP_LIBGCC_CALL(long long, __divdi3)
+WRAP_LIBGCC_CALL(unsigned long long, __udivdi3)
+WRAP_LIBGCC_CALL(long long, __moddi3)
+WRAP_LIBGCC_CALL(unsigned long long, __umoddi3)
+