From a1eff5e1a4ff6dbe36f12e48ec54a8bc6dc084c5 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 29 Nov 2009 07:59:08 +0000
Subject: - fix segfaults for linked elfs binaries PR:		138481
 Submitted by:	Luigi Rizzo

---
 lang/tcc/files/patch-libtcc.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'lang/tcc/files/patch-libtcc.c')

diff --git a/lang/tcc/files/patch-libtcc.c b/lang/tcc/files/patch-libtcc.c
index 9c514b3dcfc7..2fd6d59ee674 100644
--- a/lang/tcc/files/patch-libtcc.c
+++ b/lang/tcc/files/patch-libtcc.c
@@ -1,5 +1,6 @@
---- libtcc.c.orig	2009-05-18 16:27:06.000000000 +0200
-+++ libtcc.c	2009-07-03 07:51:05.000000000 +0200
+diff -ubwr ./libtcc.c ../../work.2/tcc-0.9.25/libtcc.c
+--- ./libtcc.c	2009-05-18 16:27:06.000000000 +0200
++++ ../../work.2/tcc-0.9.25/libtcc.c	2009-11-29 02:25:14.000000000 +0100
 @@ -1509,10 +1509,18 @@
  
      if (level == 0) {
@@ -19,3 +20,32 @@
          for(i=1;i<level;i++) {
              /* XXX: check address validity with program info */
              if (fp <= 0x1000)
+@@ -1784,7 +1792,9 @@
+     tcc_define_symbol(s, "__STDC__", NULL);
+     tcc_define_symbol(s, "__STDC_VERSION__", "199901L");
+ #if defined(TCC_TARGET_I386)
+-    tcc_define_symbol(s, "__i386__", NULL);
++    tcc_define_symbol(s, "__i386__", "1");
++    tcc_define_symbol(s, "__i386", "1");
++    tcc_define_symbol(s, "i386", "1");
+ #endif
+ #if defined(TCC_TARGET_X86_64)
+     tcc_define_symbol(s, "__x86_64__", NULL);
+@@ -1802,8 +1812,15 @@
+ #ifdef TCC_TARGET_PE
+     tcc_define_symbol(s, "_WIN32", NULL);
+ #else
+-    tcc_define_symbol(s, "__unix__", NULL);
+-    tcc_define_symbol(s, "__unix", NULL);
++    tcc_define_symbol(s, "__unix__", "1");
++    tcc_define_symbol(s, "__unix", "1");
++    tcc_define_symbol(s, "unix", "1");
++#if defined(__FreeBSD__)
++#define str(s) #s
++    tcc_define_symbol(s, "__FreeBSD__", str( __FreeBSD__));
++    tcc_define_symbol(s, "__INTEL_COMPILER", "1");
++#undef str
++#endif
+ #if defined(__linux)
+     tcc_define_symbol(s, "__linux__", NULL);
+     tcc_define_symbol(s, "__linux", NULL);
-- 
cgit v1.2.3