diff options
| author | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
| commit | 933e74c07231e815bbfd9ed90073308eaf253a00 (patch) | |
| tree | f1733a1feb58ecf8f2d51eb9585edd2ee23f648b /package/pcc-libs/patches/patch-csu_linux_crtend_c | |
| parent | 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff) | |
| parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pcc-libs/patches/patch-csu_linux_crtend_c')
| -rw-r--r-- | package/pcc-libs/patches/patch-csu_linux_crtend_c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/pcc-libs/patches/patch-csu_linux_crtend_c b/package/pcc-libs/patches/patch-csu_linux_crtend_c new file mode 100644 index 000000000..257f7138f --- /dev/null +++ b/package/pcc-libs/patches/patch-csu_linux_crtend_c @@ -0,0 +1,32 @@ +--- pcc-libs-1.0.0.orig/csu/linux/crtend.c 2009-08-17 01:07:07.000000000 +0200 ++++ pcc-libs-1.0.0/csu/linux/crtend.c 2011-04-12 08:36:48.951412645 +0200 +@@ -1,4 +1,4 @@ +-/* $Id: crtend.c,v 1.3 2009/08/16 23:07:07 gmcgarry Exp $ */ ++/* $Id: crtend.c,v 1.4 2011/04/12 04:44:19 gmcgarry Exp $ */ + /*- + * Copyright (c) 2008 Gregory McGarry <g.mcgarry@ieee.org> + * +@@ -17,7 +17,7 @@ + + #include "common.h" + +-asm( " .section .ctors\n" ++asm( " .section .ctors,\"aw\",@progbits\n" + #ifdef __x86_64__ + " .quad 0\n" + #else +@@ -25,7 +25,7 @@ asm( " .section .ctors\n" + #endif + ); + +-asm( " .section .dtors\n" ++asm( " .section .dtors,\"aw\",@progbits\n" + #ifdef __x86_64__ + " .quad 0\n" + #else +@@ -33,4 +33,4 @@ asm( " .section .dtors\n" + #endif + ); + +-IDENT("$Id: crtend.c,v 1.3 2009/08/16 23:07:07 gmcgarry Exp $"); ++IDENT("$Id: crtend.c,v 1.4 2011/04/12 04:44:19 gmcgarry Exp $"); |