rpms/gcc/devel gcc4-g++-struct-layout.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7715

Modified Files:
	gcc4-g++-struct-layout.patch 
Log Message:
Fix struct-layout-1.exp


gcc4-g++-struct-layout.patch:
 struct-layout-1.exp        |  163 +++++
 struct-layout-1.h          |  342 +++++++++++
 struct-layout-1_generate.c | 1339 +++++++++++++++++++++++++++++++++++++++++++++
 struct-layout-1_x1.h       |   68 ++
 struct-layout-1_x2.h       |   14 
 struct-layout-1_y1.h       |   76 ++
 struct-layout-1_y2.h       |   69 ++
 7 files changed, 2071 insertions(+)

Index: gcc4-g++-struct-layout.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc4-g++-struct-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc4-g++-struct-layout.patch	5 Apr 2005 22:53:31 -0000	1.1
+++ gcc4-g++-struct-layout.patch	6 Apr 2005 12:57:03 -0000	1.2
@@ -1,4 +1,4 @@
-2005-04-05  Jakub Jelinek  <jakub at redhat.com>
+2005-04-06  Jakub Jelinek  <jakub at redhat.com>
 
 	* g++.dg/compat/struct-layout-1.exp: New file.
 	* g++.dg/compat/struct-layout-1.h: New.
@@ -432,9 +432,9 @@
 +
 +#define T(n, fields, ops) TX(n, struct, , fields, ({ ops });)
 +#define U(n, fields, ops) TX(n, union, , fields, ({ ops });)
---- gcc/testsuite/g++.dg/compat/struct-layout-1.exp.jj	2005-04-05 16:25:18.000000000 +0200
-+++ gcc/testsuite/g++.dg/compat/struct-layout-1.exp	2005-04-05 16:38:19.000000000 +0200
-@@ -0,0 +1,155 @@
+--- gcc/testsuite/g++.dg/compat/struct-layout-1.exp.jj	2005-04-05 16:38:19.000000000 +0200
++++ gcc/testsuite/g++.dg/compat/struct-layout-1.exp	2005-04-06 08:46:50.000000000 -0400
+@@ -0,0 +1,163 @@
 +# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -472,6 +472,7 @@
 +}
 +
 +global GXX_UNDER_TEST
++global ld_library_path
 +
 +# Load procedures from common libraries. 
 +load_lib standard.exp
@@ -504,6 +505,9 @@
 +#
 +proc compat-use-tst-compiler { } {
 +    global GXX_UNDER_TEST save_gxx_under_test
++    global CXXFLAGS save_cxxflags
++    global ALWAYS_CXXFLAGS save_always_cxxflags
++    global ld_library_path save_ld_library_path
 +    global same_alt
 +
 +    # We don't need to do this if the alternate compiler is actually
@@ -511,6 +515,10 @@
 +
 +    if { $same_alt == 0 } then {
 +	set GXX_UNDER_TEST $save_gxx_under_test
++	set CXXFLAGS $save_cxxflags
++	set ALWAYS_CXXFLAGS $save_always_cxxflags
++	set ld_library_path $save_ld_library_path
++	set_ld_library_path_env_vars
 +    }
 +}
 +