3 files changed, 0 insertions, 60 deletions
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 7c665ff892d..6409a485e84 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,11 +7,6 @@
 # GNU make uses a make file named "GNUmakefile" in preference to "Makefile"
 # if it exists.  Postgres is shipped with a "GNUmakefile".
 
-
-# AIX make defaults to building *every* target of the first rule.  Start with
-# a single-target, empty rule to make the other targets non-default.
-all:
-
 all install clean check installcheck:
 	@echo "You must use GNU make to use Postgres.  It may be installed"
 	@echo "on your system with the name 'gmake'."
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index c5c675b7508..8370c1561cc 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -25,32 +25,3 @@ SELECT relname, relkind
 ---------+---------
 (0 rows)
 
---
--- When ALIGNOF_DOUBLE==4 (e.g. AIX), the C ABI may impose 8-byte alignment on
--- some of the C types that correspond to TYPALIGN_DOUBLE SQL types.  To ensure
--- catalog C struct layout matches catalog tuple layout, arrange for the tuple
--- offset of each fixed-width, attalign='d' catalog column to be divisible by 8
--- unconditionally.  Keep such columns before the first NameData column of the
--- catalog, since packagers can override NAMEDATALEN to an odd number.
---
-WITH check_columns AS (
- SELECT relname, attname,
-  array(
-   SELECT t.oid
-    FROM pg_type t JOIN pg_attribute pa ON t.oid = pa.atttypid
-    WHERE pa.attrelid = a.attrelid AND
-          pa.attnum > 0 AND pa.attnum < a.attnum
-    ORDER BY pa.attnum) AS coltypes
- FROM pg_attribute a JOIN pg_class c ON c.oid = attrelid
-  JOIN pg_namespace n ON c.relnamespace = n.oid
- WHERE attalign = 'd' AND relkind = 'r' AND
-  attnotnull AND attlen <> -1 AND n.nspname = 'pg_catalog'
-)
-SELECT relname, attname, coltypes, get_columns_length(coltypes)
- FROM check_columns
- WHERE get_columns_length(coltypes) % 8 != 0 OR
-       'name'::regtype::oid = ANY(coltypes);
- relname | attname | coltypes | get_columns_length 
----------+---------+----------+--------------------
-(0 rows)
-
diff --git a/src/test/regress/sql/sanity_check.sql b/src/test/regress/sql/sanity_check.sql
index 7f338d191c6..162e5324b5d 100644
--- a/src/test/regress/sql/sanity_check.sql
+++ b/src/test/regress/sql/sanity_check.sql
@@ -19,29 +19,3 @@ SELECT relname, relkind
   FROM pg_class
  WHERE relkind IN ('v', 'c', 'f', 'p', 'I')
        AND relfilenode <> 0;
-
---
--- When ALIGNOF_DOUBLE==4 (e.g. AIX), the C ABI may impose 8-byte alignment on
--- some of the C types that correspond to TYPALIGN_DOUBLE SQL types.  To ensure
--- catalog C struct layout matches catalog tuple layout, arrange for the tuple
--- offset of each fixed-width, attalign='d' catalog column to be divisible by 8
--- unconditionally.  Keep such columns before the first NameData column of the
--- catalog, since packagers can override NAMEDATALEN to an odd number.
---
-WITH check_columns AS (
- SELECT relname, attname,
-  array(
-   SELECT t.oid
-    FROM pg_type t JOIN pg_attribute pa ON t.oid = pa.atttypid
-    WHERE pa.attrelid = a.attrelid AND
-          pa.attnum > 0 AND pa.attnum < a.attnum
-    ORDER BY pa.attnum) AS coltypes
- FROM pg_attribute a JOIN pg_class c ON c.oid = attrelid
-  JOIN pg_namespace n ON c.relnamespace = n.oid
- WHERE attalign = 'd' AND relkind = 'r' AND
-  attnotnull AND attlen <> -1 AND n.nspname = 'pg_catalog'
-)
-SELECT relname, attname, coltypes, get_columns_length(coltypes)
- FROM check_columns
- WHERE get_columns_length(coltypes) % 8 != 0 OR
-       'name'::regtype::oid = ANY(coltypes);