diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 443947c9c0c..e932dab6568 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* layout.adb (Layout_Type): Do not set the component size of an
+	array with a scalar component if the component type is
+	overaligned.
+
 2019-07-03  Ed Schonberg  <schonberg@adacore.com>
 
 	* inline.adb (Make_Loop_Labels_Unique):  New procedure to modify
diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb
index f5f6aa83871..56379465d0e 100644
--- a/gcc/ada/layout.adb
+++ b/gcc/ada/layout.adb
@@ -443,9 +443,12 @@ package body Layout is
             Set_RM_Size (E, Esize (E));
          end if;
 
-         --  For array base types, set component size if object size of the
+         --  For array base types, set the component size if object size of the
          --  component type is known and is a small power of 2 (8, 16, 32, 64),
-         --  since this is what will always be used.
+         --  since this is what will always be used, except if a very large
+         --  alignment was specified and so Adjust_Esize_For_Alignment gave up
+         --  because, in this case, the object size is not a multiple of the
+         --  alignment and, therefore, cannot be the component size.
 
          if Ekind (E) = E_Array_Type and then Unknown_Component_Size (E) then
             declare
@@ -458,6 +461,9 @@ package body Layout is
                if Present (CT)
                  and then Is_Scalar_Type (CT)
                  and then Known_Static_Esize (CT)
+                 and then not (Known_Alignment (CT)
+                                and then Alignment_In_Bits (CT) >
+                                              Standard_Long_Long_Integer_Size)
                then
                   declare
                      S : constant Uint := Esize (CT);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 925e8b7e699..245bf25d4ac 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/alignment14.adb: New testcase.
+
 2019-07-03  Ed Schonberg  <schonberg@adacore.com>
 
 	* gnat.dg/predicate4.adb, gnat.dg/predicate4_pkg.ads: New
diff --git a/gcc/testsuite/gnat.dg/alignment14.adb b/gcc/testsuite/gnat.dg/alignment14.adb
new file mode 100644
index 00000000000..48ef6bd14e6
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/alignment14.adb
@@ -0,0 +1,17 @@
+--  { dg-do compile }
+
+procedure Alignment14 is
+
+  type My_Int1 is new Integer;
+  for My_Int1'Alignment use 8;
+
+  type Arr1 is array (1 .. 2) of My_Int1;
+
+  type My_Int2 is new Integer;
+  for My_Int2'Alignment use 16;
+
+  type Arr2 is array (1 .. 2) of My_Int2;
+
+begin
+   null;
+end Alignment14;