Merged revisions 11142-11143,11237 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r11142 | marco | 2008-05-31 18:09:18 +0200 (Sat, 31 May 2008) | 2 lines
  
   * remove need for freebsd5 directive. merge to fixes after rc1
........
  r11143 | marco | 2008-05-31 20:09:55 +0200 (Sat, 31 May 2008) | 3 lines
  
   * added somes comments to cprt0.as
     script to patch cprt0.as to current .note abi id. (run on target!)
........
  r11237 | marco | 2008-06-17 12:03:35 +0200 (Tue, 17 Jun 2008) | 2 lines
  
   * (bug 111479) gtk_misc_get_alignment and gtk_misc_get_padding had erroneous var parameters. Fixed.
........

git-svn-id: branches/rc_2_2_2@11254 -

.gitattributes

@@ -4903,6 +4903,7 @@ rtl/freebsd/freebsd.pas -text
 rtl/freebsd/i386/bsyscall.inc svneol=native#text/plain
 rtl/freebsd/i386/cprt0.as svneol=native#text/plain
 rtl/freebsd/i386/gprt0.as svneol=native#text/plain
+rtl/freebsd/i386/identpatch.sh svneol=native#text/plain
 rtl/freebsd/i386/prt0.as svneol=native#text/plain
 rtl/freebsd/i386/sighnd.inc svneol=native#text/plain
 rtl/freebsd/i386/x86.inc svneol=native#text/plain

packages/gtk2/src/gtk+/gtk/gtkmisc.inc

@@ -34,9 +34,9 @@ function GTK_MISC_GET_CLASS(obj: pointer) : PGtkMiscClass;
 
 function gtk_misc_get_type:TGtkType; cdecl; external gtklib;
 procedure gtk_misc_set_alignment(misc:PGtkMisc; xalign:gfloat; yalign:gfloat); cdecl; external gtklib;
-procedure gtk_misc_get_alignment(misc:PGtkMisc; var xalign:Pgfloat; var yalign:Pgfloat); cdecl; external gtklib;
+procedure gtk_misc_get_alignment(misc:PGtkMisc; xalign:Pgfloat; yalign:Pgfloat); cdecl; external gtklib;
 procedure gtk_misc_set_padding(misc:PGtkMisc; xpad:gint; ypad:gint); cdecl; external gtklib;
-procedure gtk_misc_get_padding(misc:PGtkMisc; var xpad:Pgint; var ypad:Pgint); cdecl; external gtklib;
+procedure gtk_misc_get_padding(misc:PGtkMisc;  xpad:Pgint;  ypad:Pgint); cdecl; external gtklib;
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

rtl/bsd/suuid.inc

@@ -15,7 +15,7 @@
 
  **********************************************************************}
 
-{$IFDEF FREEBSD5}
+{$IF DEFINED(FREEBSD) AND NOT DEFINED(FREEBSD4)} 
 {$IFDEF FPC_USE_LIBC}
 
 function cuuidgen(p:PGUID;x:cint):cint; external clib name 'uuidgen';

rtl/freebsd/i386/cprt0.as

@@ -15,10 +15,22 @@
 #**********************************************************************}
 #
 # FreeBSD  ELF startup code for Free Pascal for dynamical linking to libc.
+#
+# To avoid needing a "COMPAT" system, patch this file to change the number 
+# according to what is retured by the "file" command on a normal binary:
+#
+# `file gcc` gives
+#
+# gcc: ELF 32-bit LSB executable, Intel 80386, version 1 (FreeBSD), for 
+# FreeBSD 7.0 ($IDVERSION), statically linked, FreeBSD-style, stripped
+# 
+# freebsd 5.4 504000
+# freebsd 6.3 (prerelease) : 603100
+# freebsd 7.0 700055
 #
 
         .file   "cprt0.as"
-        .ident  "FreePascal 2.0.x series with FreeBSD 5/6 patch"
+        .ident  "FreePascal 2.2.x series dynlinked to libc"
 .section        .note.ABI-tag,"a",@progbits
         .p2align 2
         .type   abitag, @object

rtl/freebsd/i386/identpatch.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+elfdump -n `which elfdump` |awk '/FreeBSD/{print $2}' >elfversion
+IDVERSION=`cat elfversion`
+rm elfversion
+echo Patching cprt0.as with version $IDVERSION
+
+sed -I.sav -es/504000/$IDVERSION/ cprt0.as