10 files changed, 31 insertions, 134 deletions
diff --git a/libc/string/memcpy_from_ci.c b/libc/string/memcpy_from_ci.c
index 4c5582f..89fcd5a 100644
--- a/libc/string/memcpy_from_ci.c
+++ b/libc/string/memcpy_from_ci.c
@@ -1,17 +1,6 @@
-/* Copyright 2013-2016 IBM Corp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2013-2016 IBM Corp
  */
 
 #include <ccan/short_types/short_types.h>
diff --git a/libc/test/run-ctype-test.c b/libc/test/run-ctype-test.c
index bbe91d3..fa094ff 100644
--- a/libc/test/run-ctype-test.c
+++ b/libc/test/run-ctype-test.c
@@ -1,20 +1,7 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 /*
+ * Copyright 2013-2015 IBM Corp.
+ *
  * This file is run with the skiboot libc files rather than system libc.
  * This means we have a bit of "fun" with actually executing the tests on
  * the host.
diff --git a/libc/test/run-ctype.c b/libc/test/run-ctype.c
index 3851a5d..43ec47d 100644
--- a/libc/test/run-ctype.c
+++ b/libc/test/run-ctype.c
@@ -1,17 +1,6 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2013-2015 IBM Corp.
  */
 
 #define BUFSZ 50
diff --git a/libc/test/run-memops-test.c b/libc/test/run-memops-test.c
index 6303b33..9f1a2c5 100644
--- a/libc/test/run-memops-test.c
+++ b/libc/test/run-memops-test.c
@@ -1,20 +1,7 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 /*
+ * Copyright 2013-2015 IBM Corp.
+ *
  * This file is run with the skiboot libc files rather than system libc.
  * This means we have a bit of "fun" with actually executing the tests on
  * the host.
diff --git a/libc/test/run-memops.c b/libc/test/run-memops.c
index 55912ea..22aec2d 100644
--- a/libc/test/run-memops.c
+++ b/libc/test/run-memops.c
@@ -1,17 +1,6 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2013-2015 IBM Corp.
  */
 
 #define BUFSZ 50
diff --git a/libc/test/run-snprintf-test.c b/libc/test/run-snprintf-test.c
index b75d887..06428d5 100644
--- a/libc/test/run-snprintf-test.c
+++ b/libc/test/run-snprintf-test.c
@@ -1,20 +1,7 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 /*
+ * Copyright 2013-2015 IBM Corp.
+ *
  * This file is run with the skiboot libc files rather than system libc.
  * This means we have a bit of "fun" with actually executing the tests on
  * the host.
diff --git a/libc/test/run-snprintf.c b/libc/test/run-snprintf.c
index 5e67030..d7313c0 100644
--- a/libc/test/run-snprintf.c
+++ b/libc/test/run-snprintf.c
@@ -1,17 +1,6 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2013-2015 IBM Corp.
  */
 
 #define BUFSZ 50
diff --git a/libc/test/run-stdlib-test.c b/libc/test/run-stdlib-test.c
index d48c5d5..77b4bcc 100644
--- a/libc/test/run-stdlib-test.c
+++ b/libc/test/run-stdlib-test.c
@@ -1,20 +1,7 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 /*
+ * Copyright 2013-2015 IBM Corp.
+ *
  * This file is run with the skiboot libc files rather than system libc.
  * This means we have a bit of "fun" with actually executing the tests on
  * the host.
diff --git a/libc/test/run-stdlib.c b/libc/test/run-stdlib.c
index bf17604..814289c 100644
--- a/libc/test/run-stdlib.c
+++ b/libc/test/run-stdlib.c
@@ -1,17 +1,6 @@
-/* Copyright 2013-2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2013-2015 IBM Corp.
  */
 
 #define BUFSZ 50
diff --git a/libc/test/run-time.c b/libc/test/run-time.c
index aae7f4f..138803d 100644
--- a/libc/test/run-time.c
+++ b/libc/test/run-time.c
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2014-2015 IBM Corp.
+ */
 #include "/usr/include/assert.h"
 #include <stdio.h>
 #include <libc/include/time.h>