PATCH: Add tst-mallocalign1

[H.J. Lu]

On Thu, May 17, 2012 at 12:27 PM, Andreas Jaeger <aj@suse.com> wrote:
> On 05/17/2012 04:39 PM, H.J. Lu wrote:
>>
>> Hi,
>>
>> This patch adds tst-mallocalign1 to test malloc alignment.  Tested on
>> Linux/x86-64.  OK to install?
>>
>> Thanks.
>>
>>
>> H.J.
>> ---
>>        * sysdeps/x86_64/Makefile (tests): Add tst-mallocalign1.
>>        * sysdeps/x86_64/tst-mallocalign1.c: New file.
>>
>> diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
>> index 81c9128..d4525bc 100644
>> --- a/sysdeps/x86_64/Makefile
>> +++ b/sysdeps/x86_64/Makefile
>> @@ -11,6 +11,10 @@ ifeq ($(subdir),gmon)
>>  sysdep_routines += _mcount
>>  endif
>>
>> +ifeq ($(subdir),malloc)
>> +tests += tst-mallocalign1
>> +endif
>> +
>>  ifeq ($(subdir),string)
>>  sysdep_routines += cacheinfo strcasecmp_l-nonascii strncase_l-nonascii
>>  gen-as-const-headers += locale-defines.sym
>> diff --git a/sysdeps/x86_64/tst-mallocalign1.c
>> b/sysdeps/x86_64/tst-mallocalign1.c
>> new file mode 100644
>> index 0000000..6b2a386
>> --- /dev/null
>> +++ b/sysdeps/x86_64/tst-mallocalign1.c
>> @@ -0,0 +1,69 @@
>> +/* Copyright (C) 2012 Free Software Foundation, Inc.
>> +   This file is part of the GNU C Library.
>> +
>> +   The GNU C Library is free software; you can redistribute it and/or
>> +   modify it under the terms of the GNU Lesser General Public
>> +   License as published by the Free Software Foundation; either
>> +   version 2.1 of the License, or (at your option) any later version.
>> +
>> +   The GNU C Library is distributed in the hope that it will be useful,
>> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> +   Lesser General Public License for more details.
>> +
>> +   You should have received a copy of the GNU Lesser General Public
>> +   License along with the GNU C Library; if not, see
>> +<http://www.gnu.org/licenses/>.  */
>> +
>> +#include<stdio.h>
>> +#include<stdlib.h>
>> +
>> +/* Specified by x86-64 psABI.  */
>> +#define ALIGN_MASK (16 - 1)
>> +
>> +void *
>> +test (size_t s)
>> +{
>> +  void *p = malloc (s);
>> +
>> +  printf ("malloc: %d, %p: %ld\n", s, p,
>> +         ((unsigned long) p)&  ALIGN_MASK);
>
>
> I get a warning now:
> ../sysdeps/x86_64/tst-mallocalign1.c:30:4: warning: format ‘%d’ expects
> argument of type ‘int’, but argument 2 has type ‘size_t’ [-Wformat]
>

I checked in this patch.


-- 
H.J.
---
diff --git a/ChangeLog b/ChangeLog
index 284adae..793bc73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/tst-mallocalign1.c (test): Cast to unsigned long.
+
 2012-05-17  Andreas Jaeger  <aj@suse.de>

 	* sysdeps/i386/dl-machine.h (elf_machine_rel): Declare refsym only
diff --git a/sysdeps/x86_64/tst-mallocalign1.c
b/sysdeps/x86_64/tst-mallocalign1.c
index 5ce68da..d4e6036 100644
--- a/sysdeps/x86_64/tst-mallocalign1.c
+++ b/sysdeps/x86_64/tst-mallocalign1.c
@@ -26,7 +26,7 @@ test (size_t s)
 {
   void *p = malloc (s);

-  printf ("malloc: %d, %p: %ld\n", s, p,
+  printf ("malloc: %ld, %p: %ld\n", (unsigned long) s, p,
 	  ((unsigned long) p) & ALIGN_MASK);
   return p;
 }